From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 4 Sep 2009 11:30:59 +0000 (+0000)
Subject: Oops, s can be NULL
X-Git-Tag: OpenSSL-fips-2_0-rc1~1549
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4f59432c0650db1da3255ea61f78c817ee98eaf5;p=oweals%2Fopenssl.git

Oops, s can be NULL
---

diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 62b01441b6..c680980f8a 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -1759,17 +1759,15 @@ ASN1_TIME *X509_time_adj_ex(ASN1_TIME *s,
 				int offset_day, long offset_sec, time_t *in_tm)
 	{
 	time_t t;
-	int type = -1;
 
 	if (in_tm) t = *in_tm;
 	else time(&t);
 
-	if (s) type = s->type;
-	if (!(s->flags & ASN1_STRING_FLAG_MSTRING))
+	if (s && !(s->flags & ASN1_STRING_FLAG_MSTRING))
 		{
-		if (type == V_ASN1_UTCTIME)
+		if (s->type == V_ASN1_UTCTIME)
 			return ASN1_UTCTIME_adj(s,t, offset_day, offset_sec);
-		if (type == V_ASN1_GENERALIZEDTIME)
+		if (s->type == V_ASN1_GENERALIZEDTIME)
 			return ASN1_GENERALIZEDTIME_adj(s, t, offset_day,
 								offset_sec);
 		}