commit 710d227daaf4833135344690ed32ca58e91b10d6
author David Benjamin <davidben@chromium.org> Sun Jan 11 20:07:59 2015 -0500
committer Adam Langley <agl@google.com> Wed Jan 14 21:49:04 2015 +0000
tree 0913b72a9f5ed6bf144cedf6ab3ac480e9495785
parent 2adb7ec286e870e23c4b5abd367a16bae8c5e99c

Fix memory leak in SSL_new if errors occur.

(Imported from upstream's 76e6509085ea96df0ca542568ee2596343711307)

Change-Id: I6319271a1f46b3d36a4eba950cbab60420126175
Reviewed-on: https://boringssl-review.googlesource.com/2833
Reviewed-by: Adam Langley <agl@google.com>

ssl/ssl_lib.c

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index d179dc8..311c1e4 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -374,13 +374,7 @@
 
 err:
   if (s != NULL) {
-    if (s->cert != NULL) {
-      ssl_cert_free(s->cert);
-    }
-    if (s->ctx != NULL) {
-      SSL_CTX_free(s->ctx);
-    }
-    OPENSSL_free(s);
+    SSL_free(s);
   }
   OPENSSL_PUT_ERROR(SSL, SSL_new, ERR_R_MALLOC_FAILURE);