commit 18cb1740cc0fd11940836fa2fcaf6d3634c00e90
author Jiasheng Jiang <jiasheng@iscas.ac.cn> Thu Feb 17 17:47:00 2022 +0800
committer Pauli <pauli@openssl.org> Thu Feb 24 11:24:51 2022 +1100
tree 07a02a104b8d8bf3ce1cdca187adb0e87a66f462
parent cf21d1c62dcd92be624ea0fb8a86d91e4fbeed93

test/crltest.c: Add check for glue2bio

As the glue2bio() could return NULL pointer if fails,
it should be better to check the return value in order
to avoid the use of NULL pointer.

Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>

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

test/crltest.c

diff --git a/test/crltest.c b/test/crltest.c
index 3b76f4f..2c0a815 100644
--- a/test/crltest.c
+++ b/test/crltest.c
@@ -200,9 +200,16 @@
  */
 static X509_CRL *CRL_from_strings(const char **pem)
 {
+    X509_CRL *crl;
     char *p;
     BIO *b = glue2bio(pem, &p);
-    X509_CRL *crl = PEM_read_bio_X509_CRL(b, NULL, NULL, NULL);
+
+    if (b == NULL) {
+        OPENSSL_free(p);
+        return NULL;
+    }
+
+    crl = PEM_read_bio_X509_CRL(b, NULL, NULL, NULL);
 
     OPENSSL_free(p);
     BIO_free(b);
@@ -214,9 +221,16 @@
  */
 static X509 *X509_from_strings(const char **pem)
 {
+    X509 *x;
     char *p;
     BIO *b = glue2bio(pem, &p);
-    X509 *x = PEM_read_bio_X509(b, NULL, NULL, NULL);
+
+    if (b == NULL) {
+        OPENSSL_free(p);
+        return NULL;
+    }
+
+    x = PEM_read_bio_X509(b, NULL, NULL, NULL);
 
     OPENSSL_free(p);
     BIO_free(b);
@@ -363,6 +377,12 @@
     char *p;
     BIO *b = glue2bio(kRevokedCRL, &p);
 
+    if (b == NULL) {
+        OPENSSL_free(p);
+        X509_CRL_free(reused_crl);
+        return 0;
+    }
+
     reused_crl = PEM_read_bio_X509_CRL(b, &reused_crl, NULL, NULL);
 
     OPENSSL_free(p);