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:
7bca0a1
)
Fix memory leak in SSL_new if errors occur.
author
Matt Caswell
<matt@openssl.org>
Thu, 4 Dec 2014 09:46:44 +0000
(09:46 +0000)
committer
Matt Caswell
<matt@openssl.org>
Mon, 8 Dec 2014 16:42:59 +0000
(16:42 +0000)
Reviewed-by: Richard Levitte <levitte@openssl.org>
ssl/ssl_lib.c
patch
|
blob
|
history
diff --git
a/ssl/ssl_lib.c
b/ssl/ssl_lib.c
index 743204cd153b027a8b7979f25f30c8d0d1a53947..a4d565fb4ab41054741e79bf5bce671c5c6d7413 100644
(file)
--- a/
ssl/ssl_lib.c
+++ b/
ssl/ssl_lib.c
@@
-417,13
+417,7
@@
SSL *SSL_new(SSL_CTX *ctx)
return(s);
err:
if (s != NULL)
- {
- if (s->cert != NULL)
- ssl_cert_free(s->cert);
- if (s->ctx != NULL)
- SSL_CTX_free(s->ctx); /* decrement reference count */
- OPENSSL_free(s);
- }
+ SSL_free(s);
SSLerr(SSL_F_SSL_NEW,ERR_R_MALLOC_FAILURE);
return(NULL);
}