diff --git a/mozilla/security/nss/lib/certdb/genname.c b/mozilla/security/nss/lib/certdb/genname.c
index 9ee7126a308..a4eb971a8fc 100644
--- a/mozilla/security/nss/lib/certdb/genname.c
+++ b/mozilla/security/nss/lib/certdb/genname.c
@@ -373,6 +373,10 @@ cert_DecodeGeneralName(PRArenaPool      *arena,
     if (genName == NULL) {
 	genName = (CERTGeneralName *) PORT_ArenaZAlloc(arena, sizeof(CERTGeneralName));
     }
+    if (!genName) {
+        return NULL;
+    }
+    genName->l.prev = genName->l.next = &genName->l;
     genNameType = (CERTGeneralNameType)((*(encodedName->data) & 0x0f) + 1);
     switch (genNameType) {
       case certURI:
@@ -415,8 +419,6 @@ cert_DecodeGeneralName(PRArenaPool      *arena,
 	goto loser;
     }
     genName->type = genNameType;
-    genName->l.next = (PRCList *) ((char *) genName) + offsetof(CERTGeneralName, l);
-    genName->l.prev = genName->l.next;
     return genName;
 loser:
     return NULL;