diff mbox

[U-Boot] Fix gunzip to work for any gzipped uImage size Signed-off-by: Catalin Radu <Catalin@VirtualMetrix.com>

Message ID 1296664907-2185-1-git-send-email-Catalin@VirtualMetrix.com
State Superseded
Headers show

Commit Message

Catalin Radu Feb. 2, 2011, 4:41 p.m. UTC 
---
 lib/gunzip.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

Comments

Sergei Shtylyov Feb. 3, 2011, 12:57 p.m. UTC | #1 
Hello.

On 02-02-2011 19:41, Catalin Radu wrote:

> 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);

    Don't use spaces for indenting, only tabs.

WBR, Sergei
Sergei Shtylyov Feb. 3, 2011, 12:57 p.m. UTC | #2 
Your signoff line got "pasted" to the subject.

WBR, Sergei
Wolfgang Denk April 12, 2011, 6:59 p.m. UTC | #3 
Dear Catalin Radu,

In message <1296664907-2185-1-git-send-email-Catalin@VirtualMetrix.com> you wrote:
> ---
>  lib/gunzip.c |   16 ++++++++++------
>  1 files changed, 10 insertions(+), 6 deletions(-)

Please resubmit after cleaning up as requested by Sergei!

Best regards,

Wolfgang Denk
Wolfgang Denk April 12, 2011, 7:01 p.m. UTC | #4 
Dear Catalin Radu,

In message <1296664907-2185-1-git-send-email-Catalin@VirtualMetrix.com> you wrote:
> ---
>  lib/gunzip.c |   16 ++++++++++------
>  1 files changed, 10 insertions(+), 6 deletions(-)

Oops. Please ignore me.

Or rather: Next time when posting a follow up patch please make sure
to add proper thread information, and to mark the followup as a
resubmit; see
http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions

Thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

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);