From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Wed, 15 Feb 2017 10:36:17 +0000 (+0100)
Subject: Rework error handling of custom_ext_meth_add towards strong exception safety.
X-Git-Tag: OpenSSL_1_1_0e~8
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=c9c1a63d58c7950484347d153a2150b4587e7a53;hp=19d5e48d6d56f59672c08c8aa162a2a3ff3819ba

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)
(cherry picked from commit ed874fac6399d5064d6eb8fe2022b918aeaf75af)
---

diff --git a/ssl/t1_ext.c b/ssl/t1_ext.c
index a8e9f9a9cd..adcd0f9e88 100644
--- a/ssl/t1_ext.c
+++ b/ssl/t1_ext.c
@@ -181,12 +181,8 @@ static int custom_ext_meth_add(custom_ext_methods *exts,
     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;