commit ed874fac6399d5064d6eb8fe2022b918aeaf75af
author Bernd Edlinger <bernd.edlinger@hotmail.de> Wed Feb 15 11:36:17 2017 +0100
committer Rich Salz <rsalz@openssl.org> Wed Feb 15 08:37:52 2017 -0500
tree 09c2afeb0f71d4edcb5791eda24d4d95ba835233
parent bb90d02a71c60bc16389fba4ff06965714b1826f

Rework error handling of custom_ext_meth_add towards strong exception safety.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2636)

ssl/t1_ext.c

diff --git a/ssl/t1_ext.c b/ssl/t1_ext.c
index 1821647..b19e752 100644
--- a/ssl/t1_ext.c
+++ b/ssl/t1_ext.c
@@ -179,12 +179,8 @@
     tmp = OPENSSL_realloc(exts->meths,
                           (exts->meths_count + 1) * sizeof(custom_ext_method));
 
-    if (tmp == NULL) {
-        OPENSSL_free(exts->meths);
-        exts->meths = NULL;
-        exts->meths_count = 0;
+    if (tmp == NULL)
         return 0;
-    }
 
     exts->meths = tmp;
     meth = exts->meths + exts->meths_count;