diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-04 17:29:02 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-04 14:27:45 -0500 |
| commit | eeb86ba2a97e85b32ab790494a25f465140a55db (patch) | |
| tree | c6882ff336de68c8427df3ac55e69decc88cc55b /vcl/source | |
| parent | c1a756df130082ba25ba40c67293eab5fe15bd5b (diff) | |
WMF import: restore support for the ImplReadDIB(bFileHeader=false) version
Regression from commit f7799c9317cc3187ae8aaedc36f829d478a59e77
(Resolves: #i124467# add check for image data offset..., 2014-03-28).
Change-Id: I71e78aefca2ca5b07f763ec798226b9bb39a5254
(cherry picked from commit 9984807f17593b97778fc31824c50706ea2e826c)
Reviewed-on: https://gerrit.libreoffice.org/8849
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/gdi/dibtools.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 2759c20a8952..077f0b00a99b 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -626,7 +626,9 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, Bitmap* pBmpAlpha, sal_uLon if(ImplReadDIBInfoHeader(rIStm, aHeader, bTopDown) && aHeader.nWidth && aHeader.nHeight && aHeader.nBitCount) { - if (aHeader.nSize > nOffset) + // In case ImplReadDIB() didn't call ImplReadDIBFileHeader() before + // this method, nOffset is 0, that's OK. + if (nOffset && aHeader.nSize > nOffset) { // Header size claims to extend into the image data. // Looks like an error. |