diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-06-11 13:44:56 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-06-11 13:44:56 -0400 |
| commit | fbaf2857cc9ea8324b3f19dc79d32a6c1ad31696 (patch) | |
| tree | de8fce0c60462de227d03f76402b432d304b0d97 | |
| parent | a020f54c25985fc83e809daa15a3920731d39612 (diff) | |
| download | openssl-fbaf2857cc9ea8324b3f19dc79d32a6c1ad31696.tar.gz | |
If-guard to avoid null ptr deref in statem_srvr.c
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
CLA: trivial
(Merged from https://github.com/openssl/openssl/pull/3419)
| -rw-r--r-- | ssl/statem/statem_srvr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index c26c93bdc9..e2d618c863 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -1444,7 +1444,8 @@ MSG_PROCESS_RETURN tls_process_client_hello(SSL *s, PACKET *pkt) err: ossl_statem_set_error(s); - OPENSSL_free(clienthello->pre_proc_exts); + if (clienthello != NULL) + OPENSSL_free(clienthello->pre_proc_exts); OPENSSL_free(clienthello); return MSG_PROCESS_ERROR; |