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

Fixes to address memory allocation problems - Bug #8227

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@40016 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dougt%netscape.com
1999-07-18 20:56:12 +00:00
parent 6ec2bdcb0f
commit e8c9ffe47b
20 changed files with 697 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mozilla/xpinstall/src/nsInstallDelete.cpp
View File

@@ -55,6 +55,13 @@ nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
mFinalFile = new nsFileSpec(folderSpec);
if (mFinalFile == nsnull)
{
*error = nsInstall::OUT_OF_MEMORY;
return;
}
*mFinalFile += inPartialPath;
*error = ProcessInstallDelete();
@@ -103,8 +110,11 @@ PRInt32 nsInstallDelete::Complete()
if (mDeleteStatus == DELETE_COMPONENT)
{
char* temp = mRegistryName.ToNewCString();
err = VR_Remove(temp);
delete [] temp;
if (temp)
{
err = VR_Remove(temp);
delete [] temp;
}
}
if ((mDeleteStatus == DELETE_FILE) || (err == REGERR_OK))
@@ -128,11 +138,15 @@ char* nsInstallDelete::toString()
{
char* buffer = new char[1024];
if (buffer == nsnull)
return nsnull;
if (mDeleteStatus == DELETE_COMPONENT)
{
char* temp = mRegistryName.ToNewCString();
sprintf( buffer, nsInstallResources::GetDeleteComponentString(), temp);
delete [] temp;
if (temp)
delete [] temp;
}
else
{
@@ -167,6 +181,9 @@ PRInt32 nsInstallDelete::ProcessInstallDelete()
{
/* Check if the component is in the registry */
tempCString = mRegistryName.ToNewCString();
if (tempCString == nsnull)
return nsInstall::OUT_OF_MEMORY;
err = VR_InRegistry( tempCString );
@@ -180,6 +197,9 @@ PRInt32 nsInstallDelete::ProcessInstallDelete()
tempRegistryString = (char*)PR_Calloc(MAXREGPATHLEN, sizeof(char));
if (tempRegistryString == nsnull)
return nsInstall::OUT_OF_MEMORY;
err = VR_GetPath( tempCString , MAXREGPATHLEN, tempRegistryString);
if (err == REGERR_OK)
@@ -188,6 +208,10 @@ PRInt32 nsInstallDelete::ProcessInstallDelete()
delete mFinalFile;
mFinalFile = new nsFileSpec(tempRegistryString);
if (mFinalFile == nsnull)
return nsInstall::OUT_OF_MEMORY;
}
PR_FREEIF(tempRegistryString);