From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Fri, 2 Mar 2018 08:27:39 +0000 (+0100)
Subject: Fix a possible memory leak in engine_table_register
X-Git-Tag: OpenSSL_1_1_0h~55
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2a501ce23b47ce8c37cb098c8ce862f6f2865b03;p=oweals%2Fopenssl.git

Fix a possible memory leak in engine_table_register

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

(cherry picked from commit 55a7f77d72930f9aee1a51e0af9658b2728be127)
---

diff --git a/crypto/engine/eng_table.c b/crypto/engine/eng_table.c
index 219253a38a..ffdecb9991 100644
--- a/crypto/engine/eng_table.c
+++ b/crypto/engine/eng_table.c
@@ -109,6 +109,11 @@ int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup,
             }
             fnd->funct = NULL;
             (void)lh_ENGINE_PILE_insert(&(*table)->piles, fnd);
+            if (lh_ENGINE_PILE_retrieve(&(*table)->piles, &tmplate) != fnd) {
+                sk_ENGINE_free(fnd->sk);
+                OPENSSL_free(fnd);
+                goto end;
+            }
         }
         /* A registration shouldn't add duplicate entries */
         (void)sk_ENGINE_delete_ptr(fnd->sk, e);