From: Shane Lontis <shane.lontis@oracle.com>
Date: Mon, 24 Aug 2020 02:52:56 +0000 (+1000)
Subject: Fix coverity CID #1454815 - NULL ptr dereference in initthread.c
X-Git-Tag: openssl-3.0.0-alpha7~383
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59ed73398920a9ad663da03a08cfd290995f55af;p=thirdparty%2Fopenssl.git

Fix coverity CID #1454815 - NULL ptr dereference in initthread.c

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/12708)
---

diff --git a/crypto/initthread.c b/crypto/initthread.c
index c9a34a77db2..5ad38dfee2f 100644
--- a/crypto/initthread.c
+++ b/crypto/initthread.c
@@ -392,13 +392,14 @@ static int init_thread_deregister(void *index, int all)
     for (i = 0; i < sk_THREAD_EVENT_HANDLER_PTR_num(gtr->skhands); i++) {
         THREAD_EVENT_HANDLER **hands
             = sk_THREAD_EVENT_HANDLER_PTR_value(gtr->skhands, i);
-        THREAD_EVENT_HANDLER *curr = *hands, *prev = NULL, *tmp;
+        THREAD_EVENT_HANDLER *curr = NULL, *prev = NULL, *tmp;
 
         if (hands == NULL) {
             if (!all)
                 CRYPTO_THREAD_unlock(gtr->lock);
             return 0;
         }
+        curr = *hands;
         while (curr != NULL) {
             if (all || curr->index == index) {
                 if (prev != NULL)