Backout the last change, undoing the fix for bug 320336 and bug 333405.

1 files changed, 7 insertions, 11 deletions

diff --git a/security/nss/lib/util/secitem.c b/security/nss/lib/util/secitem.c
index 20eaecd0c..71009143c 100644
--- a/security/nss/lib/util/secitem.c
+++ b/security/nss/lib/util/secitem.c
@@ -65,17 +65,17 @@ SECITEM_AllocItem(PRArenaPool *arena, SECItem *item, unsigned int len)
 	    goto loser;
 	}
     } else {
+	PORT_Assert(item->data == NULL);
 	result = item;
     }
 
     result->len = len;
-    if (arena != NULL) {
-	result->data = PORT_ArenaAlloc(arena, len);
-    } else {
-	result->data = PORT_Alloc(len);
-    }
-    if (result->data == NULL && len) {
-	goto loser;
+    if (len) {
+	if (arena != NULL) {
+	    result->data = PORT_ArenaAlloc(arena, len);
+	} else {
+	    result->data = PORT_Alloc(len);
+	}
     }
 
     if (mark) {
@@ -96,10 +96,6 @@ loser:
 	if (result != NULL) {
 	    SECITEM_FreeItem(result, (item == NULL) ? PR_TRUE : PR_FALSE);
 	}
-	/*
-	 * If item is not NULL, the above has set item->data and
-	 * item->len to 0.
-	 */
     }
     return(NULL);
 }