From c9c1a63d58c7950484347d153a2150b4587e7a53 Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Wed, 15 Feb 2017 11:36:17 +0100 Subject: [PATCH 1/1] Rework error handling of custom_ext_meth_add towards strong exception safety. Reviewed-by: Matt Caswell Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2636) (cherry picked from commit ed874fac6399d5064d6eb8fe2022b918aeaf75af) --- ssl/t1_ext.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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; -- 2.34.1