From 5960ce4d60b37788b55b472ee64accb675e8db89 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 6 Jul 2015 11:13:10 +0100 Subject: 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/16826 Tested-by: Jenkins Reviewed-by: Michael Stahl --- tools/source/zcodec/zcodec.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx index b5c645ac92e2..92de8988ef62 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. -- cgit v1.2.3