projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a020f54
)
If-guard to avoid null ptr deref in statem_srvr.c
author
Rich Salz
<rsalz@openssl.org>
Sun, 11 Jun 2017 17:44:56 +0000
(13:44 -0400)
committer
Rich Salz
<rsalz@openssl.org>
Sun, 11 Jun 2017 17:44:56 +0000
(13:44 -0400)
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)
ssl/statem/statem_srvr.c
patch
|
blob
|
history
diff --git
a/ssl/statem/statem_srvr.c
b/ssl/statem/statem_srvr.c
index c26c93bdc97da9fef257c7e823b228cda6548e42..e2d618c86365a57229366a1ee1e0e313caaf66d9 100644
(file)
--- 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;