From 4218d9d8060ae23af23a727d037abc8b0fac1688 Mon Sep 17 00:00:00 2001 From: "benjamin@smedbergs.us" Date: Mon, 27 Aug 2007 10:01:10 -0700 Subject: [PATCH] Followup to bug 392251 - try to fix Ts regression by checking for directory existence before trying to enumerate it, r=dcamp on IRC --- toolkit/xre/nsXREDirProvider.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp index 8504b1bf3adc..2aae5e1f3db2 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -551,6 +551,10 @@ LoadAppBundlesIntoArray(nsIFile* aXULAppDir, dir->AppendNative(NS_LITERAL_CSTRING("distribution")); dir->AppendNative(NS_LITERAL_CSTRING("bundles")); + PRBool exists; + if (NS_FAILED(dir->Exists(&exists)) || !exists) + return; + nsCOMPtr e; rv = dir->GetDirectoryEntries(getter_AddRefs(e)); if (NS_FAILED(rv)) @@ -573,7 +577,6 @@ LoadAppBundlesIntoArray(nsIFile* aXULAppDir, ++a; } - PRBool exists; rv = subdir->Exists(&exists); if (NS_SUCCEEDED(rv) && exists) aDirectories.AppendObject(subdir);