[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - tools/source

[Caolán McNamara]

 tools/source/zcodec/zcodec.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 01b5b8c5ac67404473e97d3db5e6824b65003f04
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 6 11:13:10 2015 +0100

    only inflate if status from InitDecompress is good
    
    Change-Id: Ief207205b3f05dd0ed92a2d1d30e265cbdb914e3
    (cherry picked from commit 5aff134960b046a05f6255d10fd6d8ec72a3ff41)
    
    -1 -> Z_ERRNO for clarity
    
    Change-Id: I29aa8531646f416a72b89f7571b757c39705c31a
    (cherry picked from commit 8cb69cc82c11b640c0328f4788c05bed1ac15e90)
    Reviewed-on: https://gerrit.libreoffice.org/16827
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index 5069b7c..a2ea241 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -153,7 +153,7 @@ long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm )
                 UpdateCRC( mpInBuf, nInToRead );
 
         }
-        err = inflate( PZSTREAM, Z_NO_FLUSH );
+        err = mbStatus ? inflate(PZSTREAM, Z_NO_FLUSH) : Z_ERRNO;
         if ( err < 0 )
         {
             mbStatus = false;
@@ -220,7 +220,7 @@ long ZCodec::Read( SvStream& rIStm, sal_uInt8* pData, sal_uIntPtr nSize )
                 UpdateCRC( mpInBuf, nInToRead );
 
         }
-        err = inflate( PZSTREAM, Z_NO_FLUSH );
+        err = mbStatus ? inflate(PZSTREAM, Z_NO_FLUSH) : Z_ERRNO;
         if ( err < 0 )
         {
             // Accept Z_BUF_ERROR as EAGAIN or EWOULDBLOCK.
@@ -273,7 +273,7 @@ long ZCodec::ReadAsynchron( SvStream& rIStm, sal_uInt8* pData, sal_uIntPtr nSize
                 UpdateCRC( mpInBuf, nInToRead );
 
         }
-        err = inflate( PZSTREAM, Z_NO_FLUSH );
+        err = mbStatus ? inflate(PZSTREAM, Z_NO_FLUSH) : Z_ERRNO;
         if ( err < 0 )
         {
             // Accept Z_BUF_ERROR as EAGAIN or EWOULDBLOCK.