From aacaacc16938b030a1341d8dbaf56c6a2efeb1dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 1 Mar 2017 11:12:45 +0000
Subject: [PATCH] ofz: Z_NEED_DICT is unsupported

Change-Id: Ib0945d5a4606915aff9ee3019203caaf2a3cc7c5
---
 tools/source/zcodec/zcodec.cxx                    |   2 +-
 .../data/bmp/fail/nodict-compress.bmp             | Bin 0 -> 110 bytes
 vcl/source/gdi/dibtools.cxx                       |   5 +++--
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 vcl/qa/cppunit/graphicfilter/data/bmp/fail/nodict-compress.bmp

diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index 161aa33e41ad..c935bb8c4562 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -222,7 +222,7 @@ long ZCodec::Read( SvStream& rIStm, sal_uInt8* pData, sal_uInt32 nSize )
 
         }
         err = mbStatus ? inflate(PZSTREAM, Z_NO_FLUSH) : Z_ERRNO;
-        if ( err < 0 )
+        if (err < 0 || err == Z_NEED_DICT)
         {
             // Accept Z_BUF_ERROR as EAGAIN or EWOULDBLOCK.
             mbStatus = (err == Z_BUF_ERROR);
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/fail/nodict-compress.bmp b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/nodict-compress.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..a75d6ebae540049a3c1e1487db82db684540aef5
GIT binary patch
literal 110
zcmZ?rEz@Aou3}(d&;Vi)Al7UE5)1|mj0_wM!7f0`%pf(@(!|2pB01H<z|7F#j}u4_
hgKrrVgAP!oG!Ux+F$WNX^e_TxIDiYNsR;lT001TZ3u^!X

literal 0
HcmV?d00001

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 89abf96edbb5..8dd710e5dab1 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -841,7 +841,8 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_u
                 // Seek behind the encoded block. There might have been bytes left or the codec might have read more than necessary.
                 rIStm.Seek(nCodedSize + nCodedPos);
             }
-            else
+
+            if (aData.empty())
             {
                 // add something so we can take address of the first element
                 aData.resize(1);
@@ -850,7 +851,7 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_u
 
             // set decoded bytes to memory stream,
             // from which we will read the bitmap data
-            pMemStm.reset( new SvMemoryStream);
+            pMemStm.reset(new SvMemoryStream);
             pIStm = pMemStm.get();
             assert(!aData.empty());
             pMemStm->SetBuffer(aData.data(), nUncodedSize, nUncodedSize);