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:
02a62d1
)
SSL_COMP_add_compression_method: exit if allocating the new compression method struct...
author
Jonas Maebe
<jonas.maebe@elis.ugent.be>
Mon, 2 Dec 2013 21:07:02 +0000
(22:07 +0100)
committer
Kurt Roeckx
<kurt@roeckx.be>
Wed, 10 Dec 2014 17:35:17 +0000
(18:35 +0100)
Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Matt Caswell <matt@openssl.org>
ssl/ssl_ciph.c
patch
|
blob
|
history
diff --git
a/ssl/ssl_ciph.c
b/ssl/ssl_ciph.c
index 1599d7971ca496a4e4a4c3f99708f2c12195f732..133d9d9b2fdefba7da3b5d3d17f3fedf8fe1fa93 100644
(file)
--- a/
ssl/ssl_ciph.c
+++ b/
ssl/ssl_ciph.c
@@
-1962,6
+1962,13
@@
int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
MemCheck_off();
comp=(SSL_COMP *)OPENSSL_malloc(sizeof(SSL_COMP));
+ if (comp == NULL)
+ {
+ MemCheck_on();
+ SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,ERR_R_MALLOC_FAILURE);
+ return(1);
+ }
+
comp->id=id;
comp->method=cm;
load_builtin_compressions();