Fixed a bunch of Freeing Memory Mismatches.

Now using Recycle.
Fixes 8538.
This commit is contained in:
dougt%netscape.com 1999-09-22 04:43:03 +00:00
parent ca0b8e173d
commit 9371ab2df1
11 changed files with 44 additions and 44 deletions

View File

@ -912,7 +912,7 @@ nsInstall::GetComponentFolder(const nsString& aComponentName, const nsString& aS
}
if (componentCString)
delete [] componentCString;
Recycle(componentCString);
return NS_OK;
}
@ -1275,7 +1275,7 @@ nsInstall::StartInstall(const nsString& aUserPackageName, const nsString& aRegis
}
if(szRegPackageName)
delete [] szRegPackageName;
Recycle(szRegPackageName);
if (mVersionInfo != nsnull)
delete mVersionInfo;

View File

@ -113,7 +113,7 @@ PRInt32 nsInstallDelete::Complete()
if (temp)
{
err = VR_Remove(temp);
delete [] temp;
Recycle(temp);
}
}
@ -153,7 +153,7 @@ char* nsInstallDelete::toString()
nsCRT::free(rsrcVal);
}
if (temp)
delete [] temp;
Recycle(temp);
}
else
{
@ -234,7 +234,7 @@ PRInt32 nsInstallDelete::ProcessInstallDelete()
}
if(tempCString)
delete [] tempCString;
Recycle(tempCString);
if (mFinalFile->Exists())
{

View File

@ -123,7 +123,7 @@ char* nsInstallExecute::toString()
}
if (tempString)
delete [] tempString;
Recycle(tempString);
}
else
{

View File

@ -76,7 +76,7 @@ nsInstallFile::nsInstallFile(nsInstall* inInstall,
if (newVersion == nsnull)
{
delete [] qualifiedRegNameString;
Recycle(qualifiedRegNameString);
*error = nsInstall::OUT_OF_MEMORY;
return;
}
@ -91,7 +91,7 @@ nsInstallFile::nsInstallFile(nsInstall* inInstall,
if (newVersion == nsnull)
{
delete [] qualifiedRegNameString;
Recycle(qualifiedRegNameString);
delete oldVersion;
*error = nsInstall::OUT_OF_MEMORY;
return;
@ -114,13 +114,13 @@ nsInstallFile::nsInstallFile(nsInstall* inInstall,
areTheyEqual == nsIDOMInstallVersion::BLD_DIFF_MINUS )
{
// the file to be installed is OLDER than what is on disk. Return error
delete [] qualifiedRegNameString;
Recycle(qualifiedRegNameString);
*error = areTheyEqual;
return;
}
}
delete [] qualifiedRegNameString;
Recycle(qualifiedRegNameString);
mFinalFile = new nsFileSpec(folderSpec);

View File

@ -362,7 +362,7 @@ nsInstallFileOpItem::NativeFileOpDirRename(nsFileSpec* aSrc, nsString* aTarget)
aSrc->Rename(szTarget);
if (szTarget)
delete [] szTarget;
Recycle(szTarget);
return NS_OK;
}
@ -403,7 +403,7 @@ nsInstallFileOpItem::NativeFileOpFileRename(nsFileSpec* aSrc, nsString* aTarget)
aSrc->Rename(szTarget);
if (szTarget)
delete [] szTarget;
Recycle(szTarget);
return NS_OK;
}

View File

@ -75,7 +75,7 @@ nsInstallPatch::nsInstallPatch( nsInstall* inInstall,
PRInt32 err = VR_GetPath(tempVersionString, MAXREGPATHLEN, tempTargetFile );
delete [] tempVersionString;
Recycle(tempVersionString);
if (err != REGERR_OK)
{
@ -285,8 +285,8 @@ PRInt32 nsInstallPatch::Complete()
tempVersion,
PR_FALSE );
if (tempRegName) delete [] tempRegName;
if (tempVersion) delete [] tempVersion;
if (tempRegName) Recycle(tempRegName);
if (tempVersion) Recycle(tempVersion);
}
else

View File

@ -390,7 +390,7 @@ nsInstallTrigger::CompareVersion(const nsString& aRegName, nsIDOMInstallVersion*
}
if (tempCString)
delete [] tempCString;
Recycle(tempCString);
return NS_OK;
}
@ -428,7 +428,7 @@ nsInstallTrigger::GetVersion(const nsString& component, nsString& version)
}
if (tempCString)
delete [] tempCString;
Recycle(tempCString);
return NS_OK;
}

View File

@ -114,7 +114,7 @@ char* nsInstallUninstall::toString()
}
if (temp)
delete [] temp;
Recycle(temp);
return buffer;
}

View File

@ -1333,7 +1333,7 @@ InstallTRACE(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
tempStr = b0.ToNewCString();
printf("Install:\t%s\n", tempStr);
delete [] tempStr;
Recycle(tempStr);
return JS_TRUE;
}

View File

@ -120,9 +120,9 @@ nsWinProfile::NativeGetString(nsString section, nsString key, nsString* aReturn
*aReturn = valbuf;
if (sectionCString) delete [] sectionCString;
if (keyCString) delete [] keyCString;
if (filenameCString) delete [] filenameCString;
if (sectionCString) Recycle(sectionCString);
if (keyCString) Recycle(keyCString);
if (filenameCString) Recycle(filenameCString);
}
return numChars;
@ -147,10 +147,10 @@ nsWinProfile::NativeWriteString( nsString section, nsString key, nsString value
success = WritePrivateProfileString( sectionCString, keyCString, valueCString, filenameCString );
if (sectionCString) delete [] sectionCString;
if (keyCString) delete [] keyCString;
if (valueCString) delete [] valueCString;
if (filenameCString) delete [] filenameCString;
if (sectionCString) Recycle(sectionCString);
if (keyCString) Recycle(keyCString);
if (valueCString) Recycle(valueCString);
if (filenameCString) Recycle(filenameCString);
}
return success;

View File

@ -276,8 +276,8 @@ nsWinReg::NativeCreateKey(const nsString& subkey, const nsString& classname)
}
#endif
if (subkeyCString) delete [] subkeyCString;
if (classnameCString) delete [] classnameCString;
if (subkeyCString) Recycle(subkeyCString);
if (classnameCString) Recycle(classnameCString);
return result;
}
@ -294,7 +294,7 @@ nsWinReg::NativeDeleteKey(const nsString& subkey)
result = RegDeleteKey( root, subkeyCString );
#endif
if (subkeyCString) delete [] subkeyCString;
if (subkeyCString) Recycle(subkeyCString);
return result;
}
@ -317,8 +317,8 @@ nsWinReg::NativeDeleteValue(const nsString& subkey, const nsString& valname)
RegCloseKey( newkey );
}
if (subkeyCString) delete [] subkeyCString;
if (valnameCString) delete [] valnameCString;
if (subkeyCString) Recycle(subkeyCString);
if (valnameCString) Recycle(valnameCString);
return result;
#else
@ -349,9 +349,9 @@ nsWinReg::NativeSetValueString(const nsString& subkey, const nsString& valname,
RegCloseKey( newkey );
}
if (subkeyCString) delete [] subkeyCString;
if (valnameCString) delete [] valnameCString;
if (valueCString) delete [] valueCString;
if (subkeyCString) Recycle(subkeyCString);
if (valnameCString) Recycle(valnameCString);
if (valueCString) Recycle(valueCString);
return result;
}
@ -384,8 +384,8 @@ nsWinReg::NativeGetValueString(const nsString& subkey, const nsString& valname,
*aReturn = (char*)valbuf;
}
if (subkeyCString) delete [] subkeyCString;
if (valnameCString) delete [] valnameCString;
if (subkeyCString) Recycle(subkeyCString);
if (valnameCString) Recycle(valnameCString);
}
PRInt32
@ -407,8 +407,8 @@ nsWinReg::NativeSetValueNumber(const nsString& subkey, const nsString& valname,
RegCloseKey( newkey );
}
if (subkeyCString) delete [] subkeyCString;
if (valnameCString) delete [] valnameCString;
if (subkeyCString) Recycle(subkeyCString);
if (valnameCString) Recycle(valnameCString);
return result;
}
@ -441,8 +441,8 @@ nsWinReg::NativeGetValueNumber(const nsString& subkey, const nsString& valname,
*aReturn = valbuf;
}
if (subkeyCString) delete [] subkeyCString;
if (valnameCString) delete [] valnameCString;
if (subkeyCString) Recycle(subkeyCString);
if (valnameCString) Recycle(valnameCString);
}
PRInt32
@ -472,8 +472,8 @@ nsWinReg::NativeSetValue(const nsString& subkey, const nsString& valname, nsWinR
RegCloseKey( newkey );
}
if (subkeyCString) delete [] subkeyCString;
if (valnameCString) delete [] valnameCString;
if (subkeyCString) Recycle(subkeyCString);
if (valnameCString) Recycle(valnameCString);
return result;
#else
@ -512,8 +512,8 @@ nsWinReg::NativeGetValue(const nsString& subkey, const nsString& valname)
RegCloseKey( newkey );
}
if (subkeyCString) delete [] subkeyCString;
if (valnameCString) delete [] valnameCString;
if (subkeyCString) Recycle(subkeyCString);
if (valnameCString) Recycle(valnameCString);
return value;
#else