diff options
author | jpierre%netscape.com <devnull@localhost> | 2004-04-06 21:04:44 +0000 |
---|---|---|
committer | jpierre%netscape.com <devnull@localhost> | 2004-04-06 21:04:44 +0000 |
commit | aa3a31f3b57525ad92af825446c5d562ef1efff9 (patch) | |
tree | 67b43a7300dad0550be9d6f764eacc4703785b09 | |
parent | 987dda30d6a4eeebe8a37fd28afb4d71865cf157 (diff) | |
download | nss-hg-aa3a31f3b57525ad92af825446c5d562ef1efff9.tar.gz |
Fix for bugtraq 4877287
-rw-r--r-- | security/nss/lib/certdb/genname.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/security/nss/lib/certdb/genname.c b/security/nss/lib/certdb/genname.c index 9ee7126a3..a4eb971a8 100644 --- a/security/nss/lib/certdb/genname.c +++ b/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; |