diff options
| author | Catalin Radu <Catalin@VirtualMetrix.com> | 2011-02-04 14:35:47 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-12 22:58:30 +0200 |
| commit | f039ada5c10925147eb5bb15f63c430dbde76c3f (patch) | |
| tree | 15be288df2d9d4e29d47253f3986a401ae7b2409 /lib | |
| parent | 1472af34c17744d0ae5979efd0c625c10d67797c (diff) | |
| download | olio-uboot-2014.01-f039ada5c10925147eb5bb15f63c430dbde76c3f.tar.xz olio-uboot-2014.01-f039ada5c10925147eb5bb15f63c430dbde76c3f.zip | |
Fix gunzip to work for any gziped uImage size
Signed-off-by: Catalin Radu <Catalin@VirtualMetrix.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gunzip.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/gunzip.c b/lib/gunzip.c index 482a4768a..8b16b2495 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); |