The branch OpenSSL_1_1_0-stable has been updated
via c9c1a63d58c7950484347d153a2150b4587e7a53 (commit)
from 19d5e48d6d56f59672c08c8aa162a2a3ff3819ba (commit)
- Log -----------------------------------------------------------------
commit c9c1a63d58c7950484347d153a2150b4587e7a53
Author: Bernd Edlinger <bernd.edlin...@hotmail.de>
Date: Wed Feb 15 11:36:17 2017 +0100
Rework error handling of custom_ext_meth_add towards strong exception
safety.
Reviewed-by: Matt Caswell <m...@openssl.org>
Reviewed-by: Rich Salz <rs...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2636)
(cherry picked from commit ed874fac6399d5064d6eb8fe2022b918aeaf75af)
-----------------------------------------------------------------------
Summary of changes:
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 a8e9f9a..adcd0f9 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;
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
