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:
16bce0e
)
Ensure that vent->smeth != NULL before we call vent->smeth()
author
Matt Caswell
<matt@openssl.org>
Wed, 2 Nov 2016 11:15:08 +0000
(11:15 +0000)
committer
Matt Caswell
<matt@openssl.org>
Wed, 9 Nov 2016 16:03:08 +0000
(16:03 +0000)
We can end up with a NULL SSL_METHOD function if a method has been
disabled. If that happens then we shouldn't call vent->smeth().
Reviewed-by: Rich Salz <rsalz@openssl.org>
ssl/statem/statem_lib.c
patch
|
blob
|
history
diff --git
a/ssl/statem/statem_lib.c
b/ssl/statem/statem_lib.c
index 2aadc77a77ffef06fb77c7a935cdddb002343d25..c05f645d87495b7403f48a1acb530c25b42d8d90 100644
(file)
--- a/
ssl/statem/statem_lib.c
+++ b/
ssl/statem/statem_lib.c
@@
-1053,7
+1053,7
@@
int ssl_choose_server_version(SSL *s, CLIENTHELLO_MSG *hello)
vent->version != 0 && vent->version != (int)candidate_vers;
++vent)
;
- if (vent->version != 0) {
+ if (vent->version != 0
&& vent->smeth != NULL
) {
const SSL_METHOD *method;
method = vent->smeth();