summaryrefslogtreecommitdiffstats
path: root/crypto/initthread.c
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2019-11-21 13:15:21 +1000
committerPauli <paul.dale@oracle.com>2019-11-22 15:26:33 +1000
commit3478a2102e8bfc63f20e22826ab39b407ff43f62 (patch)
tree1571469ccd27cac3f0f35e6664b23e758c840ed4 /crypto/initthread.c
parentacc7b9fb5c162c2ca522e5e1e09d1efbde8dc6a0 (diff)
Thread: Avoid a NULL dereference after failed initialisation.
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/10493)
Diffstat (limited to 'crypto/initthread.c')
-rw-r--r--crypto/initthread.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/initthread.c b/crypto/initthread.c
index da30d59fec..a5f770e200 100644
--- a/crypto/initthread.c
+++ b/crypto/initthread.c
@@ -380,6 +380,8 @@ static int init_thread_deregister(void *index, int all)
int i;
gtr = get_global_tevent_register();
+ if (gtr == NULL)
+ return 0;
if (!all)
CRYPTO_THREAD_write_lock(gtr->lock);
for (i = 0; i < sk_THREAD_EVENT_HANDLER_PTR_num(gtr->skhands); i++) {