[U-Boot] [PATCH] Fix gunzip to work for any gzipped uImage size Signed-off-by: Catalin Radu

[Catalin Radu]

---
 lib/gunzip.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/gunzip.c b/lib/gunzip.c
index 482a476..18cb45b 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);
 
-- 
1.6.3.3

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot