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

Bug 196299 nsSafeSaveFile::CreateBackup dereferences a NULL nsCOMPtr with operator->()

Browse Source 
r=ccarlen sr=dveditz


git-svn-id: svn://10.0.0.236/trunk@139428 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org
2003-03-14 04:03:08 +00:00
parent 8d5a9a0bea
commit edc9692ee0
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/modules/libpref/src/nsSafeSaveFile.cpp
View File

@@ -48,9 +48,9 @@ nsSafeSaveFile::nsSafeSaveFile(nsIFile *aTargetFile, PRInt32 aNumBackupCopies)
nsresult rv;
// determine if the target file currently exists
aTargetFile->Exists(&mTargetFileExists);
// if the target file doesn't exist this object does nothing
if (NS_FAILED(aTargetFile->Exists(&mTargetFileExists)))
mTargetFileExists = PR_FALSE;
if (!mTargetFileExists)
return;
@@ -84,7 +84,7 @@ nsSafeSaveFile::nsSafeSaveFile(nsIFile *aTargetFile, PRInt32 aNumBackupCopies)
nsSafeSaveFile::~nsSafeSaveFile(void)
{
// if the target file didn't exist nothing was backed up
if (mTargetFileExists) {
if (mTargetFileExists && mBackupFile) {
// if no backups desired, remove the backup file
if (mBackupCount == 0) {
mBackupFile->Remove(PR_FALSE);
@@ -103,8 +103,7 @@ nsresult nsSafeSaveFile::CreateBackup(PurgeBackupType aPurgeType)
return NS_OK;
// if a backup file currently exists... do the right thing
mBackupFile->Exists(&bExists);
if (bExists) {
if (mBackupFile && NS_SUCCEEDED(mBackupFile->Exists(&bExists)) && bExists) {
rv = ManageRedundantBackups();
if (NS_FAILED(rv))
return rv;
@@ -148,6 +147,9 @@ nsresult nsSafeSaveFile::RestoreFromBackup(void)
if (!mTargetFileExists)
return NS_ERROR_FILE_NOT_FOUND;
if (!mBackupFile)
return NS_ERROR_NOT_INITIALIZED;
rv = mTargetFile->GetNativeLeafName(fileName);
if (NS_FAILED(rv)) // yikes! out of memory
return rv;
@@ -214,6 +216,9 @@ nsresult nsSafeSaveFile::PurgeOldestRedundantBackup(void)
nsCAutoString fileName;
nsresult rv;
if (!mBackupFile)
return NS_ERROR_NULL_POINTER;
rv = mBackupFile->Clone(getter_AddRefs(backupFile));
if (NS_FAILED(rv)) // yikes! out of memory, probably best to not continue
return rv;