diff options
-rw-r--r-- | apps/s_server.c | 6 | ||||
-rw-r--r-- | crypto/conf/conf_api.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index fe33b41f65..a6af637bcf 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1930,8 +1930,10 @@ again: #ifdef CHARSET_EBCDIC ascii2ebcdic(buf,buf,i); #endif - write(fileno(stdout),buf, - (unsigned int)i); + if (write(fileno(stdout),buf, + (unsigned int)i) != i) + goto err; + if (SSL_pending(con)) goto again; break; case SSL_ERROR_WANT_WRITE: diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c index 17bae8359f..55d1d50642 100644 --- a/crypto/conf/conf_api.c +++ b/crypto/conf/conf_api.c @@ -294,7 +294,7 @@ CONF_VALUE *_CONF_new_section(CONF *conf, const char *section) v->value=(char *)sk; vv=(CONF_VALUE *)lh_insert(conf->data,v); - assert(vv == NULL); + OPENSSL_assert(vv == NULL); ok=1; err: if (!ok) |