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

Fix double free in PSM. Bug#82359, r=javi@netscape.com,sr=blizzard@mozilla.org,a=blizzard@mozilla.org

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@96201 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ddrinan%netscape.com
2001-06-01 23:48:53 +00:00
parent e0ed8874ab
commit fc606418e1
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/security/manager/ssl/src/nsCertOutliner.cpp
View File

@@ -231,7 +231,7 @@ nsCertOutliner::GetCertAtIndex(PRInt32 index)
dont_AddRef(mCertArray->ElementAt(certIndex));
nsCOMPtr<nsIX509Cert> cert = do_QueryInterface(isupport);
rawPtr = cert;
NS_ADDREF(rawPtr);
NS_IF_ADDREF(rawPtr);
break;
}
if (mOutlinerArray[i].open)

2
mozilla/security/manager/ssl/src/nsCertTree.cpp
View File

@@ -231,7 +231,7 @@ nsCertOutliner::GetCertAtIndex(PRInt32 index)
dont_AddRef(mCertArray->ElementAt(certIndex));
nsCOMPtr<nsIX509Cert> cert = do_QueryInterface(isupport);
rawPtr = cert;
NS_ADDREF(rawPtr);
NS_IF_ADDREF(rawPtr);
break;
}
if (mOutlinerArray[i].open)

14
mozilla/security/manager/ssl/src/nsNSSComponent.cpp
View File

@@ -149,22 +149,20 @@ nsNSSComponent::GetPIPNSSBundleString(const PRUnichar *name,
nsString &outString)
{
PRUnichar *ptrv = nsnull;
nsresult rv = NS_ERROR_FAILURE;
outString.SetLength(0);
if (mPIPNSSBundle && name) {
nsresult rv = mPIPNSSBundle->GetStringFromName(name, &ptrv);
rv = mPIPNSSBundle->GetStringFromName(name, &ptrv);
if (NS_SUCCEEDED(rv)) {
outString = ptrv;
return NS_OK;
} else {
outString.SetLength(0);
rv = NS_OK;
}
nsMemory::Free(ptrv);
} else {
outString.SetLength(0);
}
if (ptrv)
nsMemory::Free(ptrv);
return NS_ERROR_FAILURE;
return rv;
}
void