diff options
| author | Pauli <paul.dale@oracle.com> | 2020-09-07 23:35:29 +0200 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-09-09 10:01:05 +0200 |
| commit | b7a8fb52a95d606e073a6f232262cc121659a1fe (patch) | |
| tree | d9d3b3640de629e90998d70c26ce5bdaee8f944a /apps/s_time.c | |
| parent | In a non-shared build, don't include the md5 object files in legacy provider (diff) | |
| download | openssl-b7a8fb52a95d606e073a6f232262cc121659a1fe.tar.xz openssl-b7a8fb52a95d606e073a6f232262cc121659a1fe.zip | |
s_time: check return values better
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/12808)
Diffstat (limited to 'apps/s_time.c')
| -rw-r--r-- | apps/s_time.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/apps/s_time.c b/apps/s_time.c index ac9c72e622..3730ca540a 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -416,12 +416,19 @@ static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx) if ((conn = BIO_new(BIO_s_connect())) == NULL) return NULL; - BIO_set_conn_hostname(conn, host); - BIO_set_conn_mode(conn, BIO_SOCK_NODELAY); + if (BIO_set_conn_hostname(conn, host) <= 0 + || BIO_set_conn_mode(conn, BIO_SOCK_NODELAY) <= 0) { + BIO_free(conn); + return NULL; + } - if (scon == NULL) + if (scon == NULL) { serverCon = SSL_new(ctx); - else { + if (serverCon == NULL) { + BIO_free(conn); + return NULL; + } + } else { serverCon = scon; SSL_set_connect_state(serverCon); } |