We need to make sure we always return a trust object, even if that ob…

…ject says there is no trust.
sailfishos-mirror · Apr 18, 2002 · be22bde · be22bde
1 parent 417b04b
commit be22bde
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/security/nss/lib/pki/pki3hack.c b/security/nss/lib/pki/pki3hack.c
@@ -530,14 +530,15 @@ nssTrust_GetCERTCertTrustForCert(NSSCertificate *c, CERTCertificate *cc)
 	    return NULL;
 	}
 	nssTrust_Destroy(t);
+    } else {
+	rvTrust = PORT_ArenaAlloc(cc->arena, sizeof(CERTCertTrust));
+	if (!rvTrust) {
+	    return NULL;
+	}
+	memset(rvTrust, 0, sizeof(*rvTrust));
     }
     if (is_user_cert(c, cc)) {
 	if (!rvTrust) {
-	    rvTrust = PORT_ArenaAlloc(cc->arena, sizeof(CERTCertTrust));
-	    if (!rvTrust) {
-		return NULL;
-	    }
-	    memset(rvTrust, 0, sizeof(*rvTrust));
 	}
 	rvTrust->sslFlags |= CERTDB_USER;
 	rvTrust->emailFlags |= CERTDB_USER;