Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Workaround race. Reduce leaks. Not a real fix. Bugzilla bug 225525.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@149230 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nelsonb%netscape.com 2003-11-13 03:41:32 +00:00
parent 5531a228d3
commit 5bf80de578
2 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/security/nss/lib/pki/certificate.c
View File

@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: certificate.c,v $ $Revision: 1.47 $ $Date: 2003-08-01 02:02:46 $ $Name: not supported by cvs2svn $";
static const char CVS_ID[] = "@(#) $RCSfile: certificate.c,v $ $Revision: 1.48 $ $Date: 2003-11-13 03:41:32 $ $Name: not supported by cvs2svn $";
#endif /* DEBUG */
#ifndef NSSPKI_H
@ -301,8 +301,23 @@ nssCertificate_GetDecoding (
NSSCertificate *c
)
{
/* There is a race in assigning c->decoding.
** This is a workaround. Bugzilla bug 225525.
*/
if (!c->decoding) {
c->decoding = nssDecodedCert_Create(NULL, &c->encoding, c->type);
nssDecodedCert * deco =
nssDecodedCert_Create(NULL, &c->encoding, c->type);
/* Once this race is fixed, an assertion should be put
** here to detect any regressions.
PORT_Assert(!c->decoding);
*/
if (!c->decoding) {
/* we won the race. Use our copy. */
c->decoding = deco;
} else {
/* we lost the race. discard deco. */
nssDecodedCert_Destroy(deco);
}
}
return c->decoding;
}

26
mozilla/security/nss/lib/pki/pki3hack.c
View File

@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: pki3hack.c,v $ $Revision: 1.77 $ $Date: 2003-11-11 21:46:53 $ $Name: not supported by cvs2svn $";
static const char CVS_ID[] = "@(#) $RCSfile: pki3hack.c,v $ $Revision: 1.78 $ $Date: 2003-11-13 03:41:32 $ $Name: not supported by cvs2svn $";
#endif /* DEBUG */
/*
@ -88,6 +88,7 @@ STAN_GetDefaultCryptoContext()
}
extern const NSSError NSS_ERROR_ALREADY_INITIALIZED;
extern const NSSError NSS_ERROR_INTERNAL_ERROR;
NSS_IMPLEMENT PRStatus
STAN_LoadDefaultNSS3TrustDomain (
@ -730,21 +731,38 @@ stan_GetCERTCertificate(NSSCertificate *c, PRBool forceUpdate)
nssDecodedCert *dc = c->decoding;
CERTCertificate *cc;
/* There is a race in assigning c->decoding.
** This is a workaround. Bugzilla bug 225525.
*/
if (!dc) {
dc = nssDecodedPKIXCertificate_Create(NULL, &c->encoding);
if (!dc)
return NULL;
cc = (CERTCertificate *)dc->data;
PORT_Assert(cc);
PORT_Assert(cc); /* software error */
if (!cc) {
nssDecodedPKIXCertificate_Destroy(dc);
nss_SetError(NSS_ERROR_INTERNAL_ERROR);
return NULL;
}
PORT_Assert(!c->decoding); /* Feeble attempt at race detection. */
c->decoding = dc;
/* Once this race is fixed, an assertion should be put
** here to detect any regressions.
PORT_Assert(!c->decoding);
*/
if (!c->decoding) {
c->decoding = dc;
} else {
/* Reduce the leaks here, until the race is fixed. */
nssDecodedPKIXCertificate_Destroy(dc);
dc = c->decoding;
}
}
cc = (CERTCertificate *)dc->data;
PORT_Assert(cc);
/* When c->decoding is non-NULL on input, but dc->data is
* NULL, we don't destroy dc because some other errant
* code allocated it .
*/
if (cc) {
if (!cc->nssCertificate || forceUpdate) {
fill_CERTCertificateFields(c, cc, forceUpdate);