mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-03-02 22:37:50 +00:00
Bug 292913 Potential OOM crash [@ LoadDirsIntoArray]
patch by b.jacques@planet.nl r=darin a=bsmedberg
This commit is contained in:
parent
20e7c73484
commit
1184451153
@ -332,7 +332,10 @@ LoadDirsIntoArray(nsIFile* aComponentsList, const char* aSection,
|
||||
if (NS_FAILED(rv))
|
||||
break;
|
||||
|
||||
nsCOMPtr<nsILocalFile> dir(do_CreateInstance("@mozilla.org/file/local;1"));
|
||||
nsCOMPtr<nsILocalFile> dir = do_CreateInstance("@mozilla.org/file/local;1", &rv);
|
||||
if (NS_FAILED(rv))
|
||||
continue;
|
||||
|
||||
nsCOMPtr<nsIFile> platformDir;
|
||||
#ifdef TARGET_OS_ABI
|
||||
nsCOMPtr<nsIFile> platformABIDir;
|
||||
@ -349,12 +352,18 @@ LoadDirsIntoArray(nsIFile* aComponentsList, const char* aSection,
|
||||
continue;
|
||||
}
|
||||
|
||||
dir->Clone(getter_AddRefs(platformDir));
|
||||
rv = dir->Clone(getter_AddRefs(platformDir));
|
||||
if (NS_FAILED(rv))
|
||||
continue;
|
||||
|
||||
platformDir->AppendNative(platform);
|
||||
platformDir->AppendNative(osTarget);
|
||||
|
||||
#ifdef TARGET_OS_ABI
|
||||
dir->Clone(getter_AddRefs(platformABIDir));
|
||||
rv = dir->Clone(getter_AddRefs(platformABIDir));
|
||||
if (NS_FAILED(rv))
|
||||
continue;
|
||||
|
||||
platformABIDir->AppendNative(platform);
|
||||
platformABIDir->AppendNative(targetOSABI);
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user