From c5f64af322c16ac577c99c999b104ebd5539f8e2 Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Tue, 13 Oct 2015 13:59:15 -0700 Subject: [PATCH] Backed out changeset 6d7a8e19086c (bug 1211262) for wError build bustage CLOSED TREE --- modules/libjar/nsZipArchive.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/libjar/nsZipArchive.cpp b/modules/libjar/nsZipArchive.cpp index 6eef8120ed6..3c8f3fb960b 100644 --- a/modules/libjar/nsZipArchive.cpp +++ b/modules/libjar/nsZipArchive.cpp @@ -841,10 +841,8 @@ MOZ_WIN_MEM_TRY_BEGIN // -- 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)