corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use the '0' dir for updates - Bug 588163 - Crash [@ @0x0 | ProcessUpdates(nsIFile*, nsIFile*, nsIFile*, int, char**, char const*&) ]. r=dtownsend, approval2.0=dtownsend

Browse Source
This commit is contained in:
Robert Strong
2010-08-17 20:09:07 -04:00
parent 09bbf13df5
commit e4c29c6664
1 changed files with 15 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
toolkit/xre/nsUpdateDriver.cpp
View File

@@ -44,10 +44,7 @@
#include "nsXULAppAPI.h"
#include "nsAppRunner.h"
#include "nsILocalFile.h"
#include "nsISimpleEnumerator.h"
#include "nsIDirectoryEnumerator.h"
#include "nsCOMPtr.h"
#include "nsCOMArray.h"
#include "nsString.h"
#include "nsPrintfCString.h"
#include "prproces.h"
@@ -179,48 +176,6 @@ GetXULRunnerStubPath(const char* argv0, nsILocalFile* *aResult)
}
#endif /* XP_MACOSX */
static int
ScanDirComparator(nsIFile *a, nsIFile *b, void *unused)
{
// lexically compare the leaf names of these two files
nsCAutoString a_name, b_name;
a->GetNativeLeafName(a_name);
b->GetNativeLeafName(b_name);
return Compare(a_name, b_name);
}
static nsresult
ScanDir(nsIFile *dir, nsCOMArray<nsIFile> *result)
{
nsresult rv;
nsCOMPtr<nsISimpleEnumerator> simpEnum;
rv = dir->GetDirectoryEntries(getter_AddRefs(simpEnum));
if (NS_FAILED(rv))
return rv;
nsCOMPtr<nsIDirectoryEnumerator> dirEnum = do_QueryInterface(simpEnum, &rv);
if (NS_FAILED(rv))
return rv;
nsCOMPtr<nsIFile> file;
for (;;) {
rv = dirEnum->GetNextFile(getter_AddRefs(file));
if (NS_FAILED(rv))
return rv;
// enumeration complete when null file is returned
if (!file)
break;
if (!result->AppendObject(file))
return NS_ERROR_OUT_OF_MEMORY;
}
result->Sort(ScanDirComparator, nsnull);
return NS_OK;
}
static PRBool
GetFile(nsIFile *dir, const nsCSubstring &name, nsCOMPtr<nsILocalFile> &result)
{
@@ -568,34 +523,26 @@ ProcessUpdates(nsIFile *greDir, nsIFile *appDir, nsIFile *updRootDir,
if (NS_FAILED(rv))
return rv;
rv = updatesDir->AppendNative(NS_LITERAL_CSTRING("0"));
if (NS_FAILED(rv))
return rv;
PRBool exists;
rv = updatesDir->Exists(&exists);
if (NS_FAILED(rv) || !exists)
return rv;
nsCOMArray<nsIFile> dirEntries;
rv = ScanDir(updatesDir, &dirEntries);
if (NS_FAILED(rv))
return rv;
if (dirEntries.Count() == 0)
return NS_OK;
// look for the first update subdirectory with a status of pending
for (int i = 0; i < dirEntries.Count(); ++i) {
nsCOMPtr<nsILocalFile> statusFile;
if (GetStatusFile(dirEntries[i], statusFile) && IsPending(statusFile)) {
nsCOMPtr<nsILocalFile> versionFile;
// Remove the update if the update application version file doesn't exist
// or if the update's application version is less than the current
// application version.
if (!GetVersionFile(dirEntries[i], versionFile) ||
IsOlderVersion(versionFile, appVersion)) {
dirEntries[i]->Remove(PR_TRUE);
continue;
}
ApplyUpdate(greDir, dirEntries[i], statusFile, appDir, argc, argv);
break;
nsCOMPtr<nsILocalFile> statusFile;
if (GetStatusFile(updatesDir, statusFile) && IsPending(statusFile)) {
nsCOMPtr<nsILocalFile> versionFile;
// Remove the update if the update application version file doesn't exist
// or if the update's application version is less than the current
// application version.
if (!GetVersionFile(updatesDir, versionFile) ||
IsOlderVersion(versionFile, appVersion)) {
updatesDir->Remove(PR_TRUE);
} else {
ApplyUpdate(greDir, updatesDir, statusFile, appDir, argc, argv);
}
}