Uprev NSS to 3.18 RTM

nss/lib/pki/trustdomain.c

Index: nss/lib/pki/trustdomain.c
diff --git a/nss/lib/pki/trustdomain.c b/nss/lib/pki/trustdomain.c
index ec2086f11b9a407e35b0315a86685dd0ada5d8ff..a3d26a88d4724a4cf68646fb7927df4ba7a39716 100644
--- a/nss/lib/pki/trustdomain.c
+++ b/nss/lib/pki/trustdomain.c
@@ -831,20 +831,16 @@ nssTrustDomain_FindCertificateByEncodedCertificate (
     NSSCertificate *rvCert = NULL;
     NSSDER issuer = { 0 };
     NSSDER serial = { 0 };
-    NSSArena *arena = nssArena_Create();
-    if (!arena) {
-	return (NSSCertificate *)NULL;
-    }
     /* XXX this is not generic...  will any cert crack into issuer/serial? */
-    status = nssPKIX509_GetIssuerAndSerialFromDER(ber, arena, &issuer, &serial);
+    status = nssPKIX509_GetIssuerAndSerialFromDER(ber, &issuer, &serial);
     if (status != PR_SUCCESS) {
-	goto finish;
+	return NULL;
     }
     rvCert = nssTrustDomain_FindCertificateByIssuerAndSerialNumber(td,
                                                                    &issuer,
                                                                    &serial);
-finish:
-    nssArena_Destroy(arena);
+    PORT_Free(issuer.data);
+    PORT_Free(serial.data);
     return rvCert;
 }