From: Matt Caswell <matt@openssl.org>
Date: Wed, 21 Jun 2017 14:54:25 +0000 (+0100)
Subject: Remove OPENSSL_assert() from conf_api.c
X-Git-Tag: OpenSSL_1_1_1-pre1~811
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=64d9844ab6b6fb97ca270e236741f7dd61c1940b;p=oweals%2Fopenssl.git

Remove OPENSSL_assert() from conf_api.c

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3740)
---

diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c
index 5535416ab3..6026dca928 100644
--- a/crypto/conf/conf_api.c
+++ b/crypto/conf/conf_api.c
@@ -204,7 +204,8 @@ CONF_VALUE *_CONF_new_section(CONF *conf, const char *section)
     v->value = (char *)sk;
 
     vv = lh_CONF_VALUE_insert(conf->data, v);
-    OPENSSL_assert(vv == NULL);
+    if (vv != NULL)
+        goto err;
     return v;
 
  err: