summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2015-04-16 23:39:52 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-16 23:39:52 +0200
commit9ac3dffe180591661eaeef05803b2c7572ec4a17 (patch)
tree26ce1b3206ceb0dcf4d2cb684dcb017778caef2c
parentam 0a557b6b: am 7176a617: Merge "Don\'t use typedefs that hide *s." (diff)
parentam 4381767a: Merge "imgdiff: Avoid infinite loop if inflate fails" (diff)
downloadandroid_bootable_recovery-9ac3dffe180591661eaeef05803b2c7572ec4a17.tar
android_bootable_recovery-9ac3dffe180591661eaeef05803b2c7572ec4a17.tar.gz
android_bootable_recovery-9ac3dffe180591661eaeef05803b2c7572ec4a17.tar.bz2
android_bootable_recovery-9ac3dffe180591661eaeef05803b2c7572ec4a17.tar.lz
android_bootable_recovery-9ac3dffe180591661eaeef05803b2c7572ec4a17.tar.xz
android_bootable_recovery-9ac3dffe180591661eaeef05803b2c7572ec4a17.tar.zst
android_bootable_recovery-9ac3dffe180591661eaeef05803b2c7572ec4a17.zip
-rw-r--r--applypatch/imgdiff.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/applypatch/imgdiff.c b/applypatch/imgdiff.c
index 05c4f250f..3bac8be91 100644
--- a/applypatch/imgdiff.c
+++ b/applypatch/imgdiff.c
@@ -408,6 +408,7 @@ unsigned char* ReadImage(const char* filename,
p[2] == 0x08 && // deflate compression
p[3] == 0x00) { // no header flags
// 'pos' is the offset of the start of a gzip chunk.
+ size_t chunk_offset = pos;
*num_chunks += 3;
*chunks = realloc(*chunks, *num_chunks * sizeof(ImageChunk));
@@ -453,6 +454,14 @@ unsigned char* ReadImage(const char* filename,
strm.avail_out = allocated - curr->len;
strm.next_out = curr->data + curr->len;
ret = inflate(&strm, Z_NO_FLUSH);
+ if (ret < 0) {
+ printf("Error: inflate failed [%s] at file offset [%zu]\n"
+ "imgdiff only supports gzip kernel compression,"
+ " did you try CONFIG_KERNEL_LZO?\n",
+ strm.msg, chunk_offset);
+ free(img);
+ return NULL;
+ }
curr->len = allocated - strm.avail_out;
if (strm.avail_out == 0) {
allocated *= 2;