diff options
author | Tao Bao <tbao@google.com> | 2016-12-01 18:25:37 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-01 18:25:37 +0100 |
commit | 80cd188162779f7a538f6f8447587f7f1b52e49d (patch) | |
tree | ce41586b74c19c32913022a3cd9d15c672aa678b | |
parent | Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" (diff) | |
parent | Merge "bootable/recovery: cleanup compiler warnings (unused value)" (diff) | |
download | android_bootable_recovery-80cd188162779f7a538f6f8447587f7f1b52e49d.tar android_bootable_recovery-80cd188162779f7a538f6f8447587f7f1b52e49d.tar.gz android_bootable_recovery-80cd188162779f7a538f6f8447587f7f1b52e49d.tar.bz2 android_bootable_recovery-80cd188162779f7a538f6f8447587f7f1b52e49d.tar.lz android_bootable_recovery-80cd188162779f7a538f6f8447587f7f1b52e49d.tar.xz android_bootable_recovery-80cd188162779f7a538f6f8447587f7f1b52e49d.tar.zst android_bootable_recovery-80cd188162779f7a538f6f8447587f7f1b52e49d.zip |
-rw-r--r-- | applypatch/imgdiff.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/applypatch/imgdiff.cpp b/applypatch/imgdiff.cpp index 4dc481093..528daf113 100644 --- a/applypatch/imgdiff.cpp +++ b/applypatch/imgdiff.cpp @@ -321,6 +321,10 @@ unsigned char* ReadZip(const char* filename, // -15 means we are decoding a 'raw' deflate stream; zlib will // not expect zlib headers. int ret = inflateInit2(&strm, -15); + if (ret < 0) { + printf("failed to initialize inflate: %d\n", ret); + return NULL; + } strm.avail_out = curr->len; strm.next_out = curr->data; @@ -446,6 +450,10 @@ unsigned char* ReadImage(const char* filename, // -15 means we are decoding a 'raw' deflate stream; zlib will // not expect zlib headers. int ret = inflateInit2(&strm, -15); + if (ret < 0) { + printf("failed to initialize inflate: %d\n", ret); + return NULL; + } do { strm.avail_out = allocated - curr->len; @@ -553,10 +561,18 @@ int TryReconstruction(ImageChunk* chunk, unsigned char* out) { int ret; ret = deflateInit2(&strm, chunk->level, chunk->method, chunk->windowBits, chunk->memLevel, chunk->strategy); + if (ret < 0) { + printf("failed to initialize deflate: %d\n", ret); + return -1; + } do { strm.avail_out = BUFFER_SIZE; strm.next_out = out; ret = deflate(&strm, Z_FINISH); + if (ret < 0) { + printf("failed to deflate: %d\n", ret); + return -1; + } size_t have = BUFFER_SIZE - strm.avail_out; if (memcmp(out, chunk->deflate_data+p, have) != 0) { |