diff options
| author | KaoruToda <kunnpuu@gmail.com> | 2017-10-19 23:41:03 +0900 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2017-10-22 21:31:20 +0200 |
| commit | f84a648ca1da0177e7ed1d4b50312c5dd6a2c0c8 (patch) | |
| tree | 38de7282c2c67a1b5f87debcb73c325e47121df7 /apps/s_client.c | |
| parent | 0c1aaa24cc30de8d793f965f4a01863a25773a50 (diff) | |
| download | openssl-new-f84a648ca1da0177e7ed1d4b50312c5dd6a2c0c8.tar.gz | |
apps/s_client.c: add missing null check
apps/s_server.c: remove unnecessary null check
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4558)
Diffstat (limited to 'apps/s_client.c')
| -rw-r--r-- | apps/s_client.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 96bfc159d7..019e73535a 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -1866,6 +1866,9 @@ int s_client_main(int argc, char **argv) goto end; con = SSL_new(ctx); + if (con == NULL) + goto end; + if (sess_in != NULL) { SSL_SESSION *sess; BIO *stmp = BIO_new_file(sess_in, "r"); |