Bug 298906 crash when accepting new certificate permanently on taschenonkel.de

r=wtc, sr=nelson

1 files changed, 13 insertions, 5 deletions

diff --git a/security/nss/lib/softoken/pcertdb.c b/security/nss/lib/softoken/pcertdb.c
index 98d04d453..ca1452d1a 100644
--- a/security/nss/lib/softoken/pcertdb.c
+++ b/security/nss/lib/softoken/pcertdb.c
@@ -389,16 +389,24 @@ pkcs11_freeStaticData (unsigned char *data, unsigned char *space)
 }
 
 unsigned char *
-pkcs11_copyStaticData(unsigned char *data, int len, 
-					unsigned char *space, int spaceLen)
+pkcs11_allocStaticData(int len, unsigned char *space, int spaceLen)
 {
-    unsigned char *copy = NULL;
+    unsigned char *data = NULL;
 
     if (len <= spaceLen) {
-	copy = space;
+	data = space;
     } else {
-	copy = (unsigned char *) PORT_Alloc(len);
+	data = (unsigned char *) PORT_Alloc(len);
     }
+
+    return data;
+}
+
+unsigned char *
+pkcs11_copyStaticData(unsigned char *data, int len, 
+					unsigned char *space, int spaceLen)
+{
+    unsigned char *copy = pkcs11_allocStaticData(len, space, spaceLen);
     if (copy) {
 	PORT_Memcpy(copy,data,len);
     }