From: Daniel Fiala <daniel@openssl.org>
Date: Sun, 18 Sep 2022 05:36:36 +0000 (+0200)
Subject: Check that sk_SSL_CIPHER_value returns non-NULL value.
X-Git-Tag: openssl-3.2.0-alpha1~2061
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=630d31219b343d2654ab03d2e2c7884e764936ab;p=thirdparty%2Fopenssl.git

Check that sk_SSL_CIPHER_value returns non-NULL value.

Fixes openssl#19162.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19233)
---

diff --git a/apps/ciphers.c b/apps/ciphers.c
index fa119c6eb3b..c33685d8ced 100644
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -226,6 +226,10 @@ int ciphers_main(int argc, char **argv)
     if (!verbose) {
         for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {
             const SSL_CIPHER *c = sk_SSL_CIPHER_value(sk, i);
+
+            if (!ossl_assert(c != NULL))
+                continue;
+
             p = SSL_CIPHER_get_name(c);
             if (p == NULL)
                 break;
@@ -241,6 +245,9 @@ int ciphers_main(int argc, char **argv)
 
             c = sk_SSL_CIPHER_value(sk, i);
 
+            if (!ossl_assert(c != NULL))
+                continue;
+
             if (Verbose) {
                 unsigned long id = SSL_CIPHER_get_id(c);
                 int id0 = (int)(id >> 24);