summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2016-02-23 20:30:13 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-02-23 20:30:13 +0100
commitcc5372006f6e423e4c3f68b3dc81694fd92a7046 (patch)
treed10f18f1a15c719694e4cc4b94a21c5943ee3435
parentFix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052 am: ae68f02272 am: a3604da6e1 (diff)
parentMerge "Surpress warnings in minzip/Zip.c" (diff)
downloadandroid_bootable_recovery-cc5372006f6e423e4c3f68b3dc81694fd92a7046.tar
android_bootable_recovery-cc5372006f6e423e4c3f68b3dc81694fd92a7046.tar.gz
android_bootable_recovery-cc5372006f6e423e4c3f68b3dc81694fd92a7046.tar.bz2
android_bootable_recovery-cc5372006f6e423e4c3f68b3dc81694fd92a7046.tar.lz
android_bootable_recovery-cc5372006f6e423e4c3f68b3dc81694fd92a7046.tar.xz
android_bootable_recovery-cc5372006f6e423e4c3f68b3dc81694fd92a7046.tar.zst
android_bootable_recovery-cc5372006f6e423e4c3f68b3dc81694fd92a7046.zip
-rw-r--r--minzip/Zip.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/minzip/Zip.c b/minzip/Zip.c
index bdb565c64..38f939fb2 100644
--- a/minzip/Zip.c
+++ b/minzip/Zip.c
@@ -509,9 +509,6 @@ static bool processDeflatedEntry(const ZipArchive *pArchive,
unsigned char procBuf[32 * 1024];
z_stream zstream;
int zerr;
- long compRemaining;
-
- compRemaining = pEntry->compLen;
/*
* Initialize the zlib stream.
@@ -759,7 +756,7 @@ static const char *targetEntryPath(MzPathHelper *helper, ZipEntry *pEntry)
*/
needLen = helper->targetDirLen + 1 +
pEntry->fileNameLen - helper->zipDirLen + 1;
- if (needLen > helper->bufLen) {
+ if (firstTime || needLen > helper->bufLen) {
char *newBuf;
needLen *= 2;