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 482a4768a3f9afd9fa4d24b8927c615e892c561f..8b16b2495fbec50956ff027c5e49803435034592 100644 (file)
--- 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);