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

Fix memory leaks in the startup of the builtins.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@131733 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
relyea%netscape.com
2002-10-10 22:39:23 +00:00
parent 2a7a5dea12
commit b5715de870
4 changed files with 47 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/security/nss/lib/ckfw/instance.c
View File

@@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: instance.c,v $ $Revision: 1.6 $ $Date: 2002-08-27 23:29:36 $ $Name: not supported by cvs2svn $";
static const char CVS_ID[] = "@(#) $RCSfile: instance.c,v $ $Revision: 1.7 $ $Date: 2002-10-10 22:39:22 $ $Name: not supported by cvs2svn $";
#endif /* DEBUG */
/*
@@ -394,6 +394,14 @@ nssCKFWInstance_Destroy
fwInstance->mdInstance->Finalize(fwInstance->mdInstance, fwInstance);
}
if (fwInstance->sessionHandleHash) {
nssCKFWHash_Destroy(fwInstance->sessionHandleHash);
}
if (fwInstance->objectHandleHash) {
nssCKFWHash_Destroy(fwInstance->objectHandleHash);
}
#ifdef DEBUG
(void)instance_remove_pointer(fwInstance);
#endif /* DEBUG */

5
mozilla/security/nss/lib/ckfw/slot.c
View File

@@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: slot.c,v $ $Revision: 1.3 $ $Date: 2000-09-06 22:23:57 $ $Name: not supported by cvs2svn $";
static const char CVS_ID[] = "@(#) $RCSfile: slot.c,v $ $Revision: 1.4 $ $Date: 2002-10-10 22:39:23 $ $Name: not supported by cvs2svn $";
#endif /* DEBUG */
/*
@@ -256,6 +256,9 @@ nssCKFWSlot_Destroy
return error;
}
#endif /* NSSDEBUG */
if (fwSlot->fwToken) {
nssCKFWToken_Destroy(fwSlot->fwToken);
}
(void)nssCKFWMutex_Destroy(fwSlot->mutex);

46
mozilla/security/nss/lib/ckfw/token.c
View File

@@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: token.c,v $ $Revision: 1.7 $ $Date: 2001-11-16 19:41:49 $ $Name: not supported by cvs2svn $";
static const char CVS_ID[] = "@(#) $RCSfile: token.c,v $ $Revision: 1.8 $ $Date: 2002-10-10 22:39:23 $ $Name: not supported by cvs2svn $";
#endif /* DEBUG */
/*
@@ -307,6 +307,22 @@ nssCKFWToken_Create
return (NSSCKFWToken *)NULL;
}
static void
nss_ckfwtoken_session_iterator
(
const void *key,
void *value,
void *closure
)
{
/*
* Remember that the fwToken->mutex is locked
*/
NSSCKFWSession *fwSession = (NSSCKFWSession *)value;
(void)nssCKFWSession_Destroy(fwSession, CK_FALSE);
return;
}
/*
* nssCKFWToken_Destroy
*
@@ -332,6 +348,19 @@ nssCKFWToken_Destroy
fwToken->mdToken->Invalidate(fwToken->mdToken, fwToken,
fwToken->mdInstance, fwToken->fwInstance);
}
/* we can destroy the list without locking now because no one else is
* referencing us (or _Destroy was invalidly called!)
*/
nssCKFWHash_Iterate(fwToken->sessions, nss_ckfwtoken_session_iterator,
(void *)NULL);
nssCKFWHash_Destroy(fwToken->sessions);
if (fwToken->sessionObjectHash) {
nssCKFWHash_Destroy(fwToken->sessionObjectHash);
}
if (fwToken->mdObjectHash) {
nssCKFWHash_Destroy(fwToken->mdObjectHash);
}
nssCKFWSlot_ClearToken(fwToken->fwSlot);
@@ -1547,21 +1576,6 @@ nssCKFWToken_RemoveSession
return error;
}
static void
nss_ckfwtoken_session_iterator
(
const void *key,
void *value,
void *closure
)
{
/*
* Remember that the fwToken->mutex is locked
*/
NSSCKFWSession *fwSession = (NSSCKFWSession *)value;
(void)nssCKFWSession_Destroy(fwSession, CK_FALSE);
return;
}
/*
* nssCKFWToken_CloseAllSessions

5
mozilla/security/nss/lib/ckfw/wrap.c
View File

@@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: wrap.c,v $ $Revision: 1.7 $ $Date: 2002-09-06 00:27:33 $ $Name: not supported by cvs2svn $";
static const char CVS_ID[] = "@(#) $RCSfile: wrap.c,v $ $Revision: 1.8 $ $Date: 2002-10-10 22:39:23 $ $Name: not supported by cvs2svn $";
#endif /* DEBUG */
/*
@@ -209,6 +209,9 @@ NSSCKFWC_Finalize
/* In any case */
*pFwInstance = (NSSCKFWInstance *)NULL;
/* clean up the arena pool records */
PL_ArenaFinish();
loser:
switch( error ) {
case CKR_CRYPTOKI_NOT_INITIALIZED: