Backed out changeset d32d0321812f (bug 1211262) for bustage
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 15 Oct 2015 10:38:31 +0200
changeset 296442 e1693911e3c44d7fb11adb78a9da005058721e63
parent 296441 94ec16eae34d1b0229367a22fb8e770658be5e2f
child 296443 b14beb29be004b11792f302e85ad37053abbf641
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1211262
milestone43.0a2
backs outd32d0321812f0fc485fbbc7719010b041afc0e12
Backed out changeset d32d0321812f (bug 1211262) for bustage
modules/libjar/nsZipArchive.cpp
--- a/modules/libjar/nsZipArchive.cpp
+++ b/modules/libjar/nsZipArchive.cpp
@@ -836,20 +836,18 @@ const uint8_t* nsZipArchive::GetData(nsZ
 {
   PR_ASSERT (aItem);
 MOZ_WIN_MEM_TRY_BEGIN
   uint32_t offset = GetDataOffset(aItem);
 
   // -- check if there is enough source data in the file
   if (!offset ||
       mFd->mLen < aItem->Size() ||
-      offset > mFd->mLen - aItem->Size() ||
-      aItem->Compression() == STORED && aItem->Size() != aItem->RealSize()) {
+      offset > mFd->mLen - aItem->Size())
     return nullptr;
-  }
 
   return mFd->mFileData + offset;
 MOZ_WIN_MEM_TRY_CATCH(return nullptr)
 }
 
 // nsZipArchive::GetComment
 bool nsZipArchive::GetComment(nsACString &aComment)
 {