From: Pauli <paul.dale@oracle.com>
Date: Fri, 3 Jan 2020 09:27:06 +0000 (+1000)
Subject: coverity 1456639: fix NULL dereference
X-Git-Tag: openssl-3.0.0-alpha1~753
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=86723c2a103c763bc918dd70ffb3dd44ba5b5add;p=oweals%2Fopenssl.git

coverity 1456639: fix NULL dereference

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10748)
---

diff --git a/test/x509_time_test.c b/test/x509_time_test.c
index 8e813cb0f9..a9292dff0f 100644
--- a/test/x509_time_test.c
+++ b/test/x509_time_test.c
@@ -327,10 +327,11 @@ static int test_X509_cmp_timeframe(void)
     ASN1_TIME *asn1_before = ASN1_TIME_adj(NULL, now, -1, 0);
     ASN1_TIME *asn1_after = ASN1_TIME_adj(NULL, now, 1, 0);
     X509_VERIFY_PARAM *vpm = X509_VERIFY_PARAM_new();
-    int res;
+    int res = 0;
 
-    res = vpm != NULL
-        && test_X509_cmp_timeframe_vpm(NULL, asn1_before, asn1_mid, asn1_after)
+    if (vpm == NULL)
+        goto finish;
+    res = test_X509_cmp_timeframe_vpm(NULL, asn1_before, asn1_mid, asn1_after)
         && test_X509_cmp_timeframe_vpm(vpm, asn1_before, asn1_mid, asn1_after);
 
     X509_VERIFY_PARAM_set_time(vpm, now);
@@ -340,6 +341,7 @@ static int test_X509_cmp_timeframe(void)
         && test_X509_cmp_timeframe_vpm(vpm, asn1_before, asn1_mid, asn1_after);
 
     X509_VERIFY_PARAM_free(vpm);
+finish:
     ASN1_TIME_free(asn1_mid);
     ASN1_TIME_free(asn1_before);
     ASN1_TIME_free(asn1_after);