зеркало из https://github.com/mozilla/gecko-dev.git
Bugzilla Bug 298906 really check in the patch to the tip, not a test branch
crash when accepting new certificate permanently on taschenonkel.de r=wtc, r=nelson
This commit is contained in:
Родитель
e4ab6fa7bb
Коммит
f7cb169d0a
|
@ -37,7 +37,7 @@
|
||||||
/*
|
/*
|
||||||
* Permanent Certificate database handling code
|
* Permanent Certificate database handling code
|
||||||
*
|
*
|
||||||
* $Id: pcertdb.c,v 1.49 2005/03/29 18:21:18 nelsonb%netscape.com Exp $
|
* $Id: pcertdb.c,v 1.50 2005/08/01 20:41:30 relyea%netscape.com Exp $
|
||||||
*/
|
*/
|
||||||
#include "prtime.h"
|
#include "prtime.h"
|
||||||
|
|
||||||
|
@ -388,17 +388,25 @@ pkcs11_freeStaticData (unsigned char *data, unsigned char *space)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsigned char *
|
||||||
|
pkcs11_allocStaticData(int len, unsigned char *space, int spaceLen)
|
||||||
|
{
|
||||||
|
unsigned char *data = NULL;
|
||||||
|
|
||||||
|
if (len <= spaceLen) {
|
||||||
|
data = space;
|
||||||
|
} else {
|
||||||
|
data = (unsigned char *) PORT_Alloc(len);
|
||||||
|
}
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
unsigned char *
|
unsigned char *
|
||||||
pkcs11_copyStaticData(unsigned char *data, int len,
|
pkcs11_copyStaticData(unsigned char *data, int len,
|
||||||
unsigned char *space, int spaceLen)
|
unsigned char *space, int spaceLen)
|
||||||
{
|
{
|
||||||
unsigned char *copy = NULL;
|
unsigned char *copy = pkcs11_allocStaticData(len, space, spaceLen);
|
||||||
|
|
||||||
if (len <= spaceLen) {
|
|
||||||
copy = space;
|
|
||||||
} else {
|
|
||||||
copy = (unsigned char *) PORT_Alloc(len);
|
|
||||||
}
|
|
||||||
if (copy) {
|
if (copy) {
|
||||||
PORT_Memcpy(copy,data,len);
|
PORT_Memcpy(copy,data,len);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче