From: Shane Lontis <shane.lontis@oracle.com>
Date: Tue, 11 Aug 2020 05:17:17 +0000 (+1000)
Subject: Fix coverity CID #1465797 - Negative loop bound in collect_deserializer
X-Git-Tag: openssl-3.0.0-alpha7~510
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90e0e0d8023fca71b019232ffc5804b8d07e2ff2;p=thirdparty%2Fopenssl.git

Fix coverity CID #1465797 - Negative loop bound in collect_deserializer

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12628)
---

diff --git a/crypto/encode_decode/decoder_pkey.c b/crypto/encode_decode/decoder_pkey.c
index 7f468c24768..e04b94de863 100644
--- a/crypto/encode_decode/decoder_pkey.c
+++ b/crypto/encode_decode/decoder_pkey.c
@@ -289,6 +289,8 @@ static void collect_decoder(OSSL_DECODER *decoder, void *arg)
         return;
 
     data->error_occured = 1;         /* Assume the worst */
+    if (data->names == NULL)
+        return;
 
     end_i = sk_OPENSSL_CSTRING_num(data->names);
     for (i = 0; i < end_i; i++) {