diff options
| author | root <root@rshg047.dnsready.net> | 2011-04-30 22:33:37 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-04-30 22:33:37 +0000 |
| commit | c173ac862828a54925737fc1d90ede1dd09a312c (patch) | |
| tree | 63d6b46455a4abdaf96aef59bbaa4406c6fe04f8 /extra/xulrunner/xulrunner-omnijar.patch | |
| parent | 693b5793b8c615601135bc04216a2ca0966087c5 (diff) | |
Sat Apr 30 22:33:37 UTC 2011
Diffstat (limited to 'extra/xulrunner/xulrunner-omnijar.patch')
| -rw-r--r-- | extra/xulrunner/xulrunner-omnijar.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/xulrunner/xulrunner-omnijar.patch b/extra/xulrunner/xulrunner-omnijar.patch index 05b665afd..66ec5206c 100644 --- a/extra/xulrunner/xulrunner-omnijar.patch +++ b/extra/xulrunner/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()) { |