From: Catalin Radu <Catalin@VirtualMetrix.com>
Date: Fri, 4 Feb 2011 12:35:47 +0000 (+0200)
Subject: Fix gunzip to work for any gziped uImage size
X-Git-Tag: v2011.06-rc1~164
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f039ada5c109;hp=1472af34c17744d0ae5979efd0c625c10d67797c;p=oweals%2Fu-boot.git

Fix gunzip to work for any gziped uImage size

Signed-off-by: Catalin Radu <Catalin@VirtualMetrix.com>
---

diff --git a/lib/gunzip.c b/lib/gunzip.c
index 482a4768a3..8b16b2495f 100644
--- a/lib/gunzip.c
+++ b/lib/gunzip.c
@@ -106,12 +106,16 @@ int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
 	s.avail_in = *lenp - offset;
 	s.next_out = dst;
 	s.avail_out = dstlen;
-	r = inflate(&s, Z_FINISH);
-	if ((r != Z_STREAM_END) && (stoponerr==1)) {
-		printf ("Error: inflate() returned %d\n", r);
-		inflateEnd(&s);
-		return (-1);
-	}
+	do {
+		r = inflate(&s, Z_FINISH);
+		if (r != Z_STREAM_END && r != Z_BUF_ERROR && stoponerr == 1) {
+			printf("Error: inflate() returned %d\n", r);
+			inflateEnd(&s);
+			return -1;
+		}
+		s.avail_in = *lenp - offset - (int)(s.next_out - (unsigned char*)dst);
+		s.avail_out = dstlen;
+	} while (r == Z_BUF_ERROR);
 	*lenp = s.next_out - (unsigned char *) dst;
 	inflateEnd(&s);