summaryrefslogtreecommitdiff
path: root/community/xulrunner-oss/xulrunner-omnijar.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/xulrunner-oss/xulrunner-omnijar.patch')
-rw-r--r--community/xulrunner-oss/xulrunner-omnijar.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/community/xulrunner-oss/xulrunner-omnijar.patch b/community/xulrunner-oss/xulrunner-omnijar.patch
index 05b665afd..66ec5206c 100644
--- a/community/xulrunner-oss/xulrunner-omnijar.patch
+++ b/community/xulrunner-oss/xulrunner-omnijar.patch
@@ -468,11 +468,11 @@ diff --git a/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/js/src/xpconnect
diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp
--- a/modules/libjar/nsJAR.cpp
+++ b/modules/libjar/nsJAR.cpp
-@@ -170,26 +170,23 @@ nsJAR::Open(nsIFile* zipFile)
- NS_ENSURE_ARG_POINTER(zipFile);
+@@ -171,26 +171,23 @@ nsJAR::Open(nsIFile* zipFile)
if (mLock) return NS_ERROR_FAILURE; // Already open!
mZipFile = zipFile;
+ mOuterZipEntry.Truncate();
mLock = PR_NewLock();
NS_ENSURE_TRUE(mLock, NS_ERROR_OUT_OF_MEMORY);
@@ -499,13 +499,13 @@ diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp
NS_ENSURE_ARG_POINTER(aZipReader);
NS_ENSURE_ARG_POINTER(aZipEntry);
@@ -234,23 +231,22 @@ nsJAR::Close()
+ mLock = nsnull;
}
mParsedManifest = PR_FALSE;
mManifestData.Reset();
mGlobalStatus = JAR_MANIFEST_NOT_PARSED;
mTotalItemsInManifest = 0;
- mOuterZipEntry.Truncate(0);
-#ifdef MOZ_OMNIJAR
- if (mZip == mozilla::OmnijarReader()) {