Fix gunzip to work for any gziped uImage size
Signed-off-by: Catalin Radu <Catalin@VirtualMetrix.com>
This commit is contained in:
parent
1472af34c1
commit
f039ada5c1
16
lib/gunzip.c
16
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.avail_in = *lenp - offset;
|
||||||
s.next_out = dst;
|
s.next_out = dst;
|
||||||
s.avail_out = dstlen;
|
s.avail_out = dstlen;
|
||||||
r = inflate(&s, Z_FINISH);
|
do {
|
||||||
if ((r != Z_STREAM_END) && (stoponerr==1)) {
|
r = inflate(&s, Z_FINISH);
|
||||||
printf ("Error: inflate() returned %d\n", r);
|
if (r != Z_STREAM_END && r != Z_BUF_ERROR && stoponerr == 1) {
|
||||||
inflateEnd(&s);
|
printf("Error: inflate() returned %d\n", r);
|
||||||
return (-1);
|
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;
|
*lenp = s.next_out - (unsigned char *) dst;
|
||||||
inflateEnd(&s);
|
inflateEnd(&s);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user