From: Simon Glass <sjg@chromium.org>
Date: Tue, 2 Dec 2014 20:17:38 +0000 (-0700)
Subject: bzlib: Update destLen even on error
X-Git-Tag: KARO-TXA5-2015-06-26~38^2~98
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=362a0e43a37aa5a6316bcf895def4eda8391bb2e;hp=3086c055a073049dcfb1f01bc5c682bd947a1caa;p=karo-tx-uboot.git

bzlib: Update destLen even on error

This allows the caller to easily detect how much of the destination buffer
has been used.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/lib/bzip2/bzlib.c b/lib/bzip2/bzlib.c
index 5844e187c0..9262e4055e 100644
--- a/lib/bzip2/bzlib.c
+++ b/lib/bzip2/bzlib.c
@@ -1350,11 +1350,11 @@ int BZ_API(BZ2_bzBuffToBuffDecompress)
    strm.avail_out = *destLen;
 
    ret = BZ2_bzDecompress ( &strm );
+   *destLen -= strm.avail_out;
    if (ret == BZ_OK) goto output_overflow_or_eof;
    if (ret != BZ_STREAM_END) goto errhandler;
 
    /* normal termination */
-   *destLen -= strm.avail_out;
    BZ2_bzDecompressEnd ( &strm );
    return BZ_OK;