Bug 1280844 - Fix a null check in p12d.c. r?mt. draft
authorNicholas Nethercote <nnethercote@mozilla.com>
Tue, 21 Jun 2016 09:59:17 +1000
changeset 380175 c29f89f62bf45bf8286a4733da33c774d061ba0b
parent 380174 50086c7e64f0cbc8f6d65320ea7db15d32c1ee6d
child 380176 119a2da73907f1041f7ab85223dd77a1c44758f2
push id21158
push usernnethercote@mozilla.com
push dateMon, 20 Jun 2016 23:59:39 +0000
reviewersmt
bugs1280844
milestone50.0a1
Bug 1280844 - Fix a null check in p12d.c. r?mt. MozReview-Commit-ID: Fon5Jt8qoNx
security/nss/lib/pkcs12/p12d.c
--- a/security/nss/lib/pkcs12/p12d.c
+++ b/security/nss/lib/pkcs12/p12d.c
@@ -1611,17 +1611,17 @@ sec_pkcs12_decoder_set_attribute_value(s
 				           sec_PKCS12Attribute *, i + 1, i + 2);
     }
 
     if(!bag->attribs) {
 	return SECFailure;
     }
 
     bag->attribs[i] = PORT_ArenaZNew(bag->arena, sec_PKCS12Attribute);
-    if(!bag->attribs) {
+    if(!bag->attribs[i]) {
 	return SECFailure;
     }
 
     bag->attribs[i]->attrValue = PORT_ArenaZNewArray(bag->arena, SECItem *, 2);
     if(!bag->attribs[i]->attrValue) {
 	return SECFailure;
     }