diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-04 17:29:02 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-04 18:01:07 +0200 |
| commit | 9984807f17593b97778fc31824c50706ea2e826c (patch) | |
| tree | 10adbcff33e2b7b46627c4052db14d817e7f3250 /vcl/source/gdi | |
| parent | e7c0f8711f95895b501c869959fe07b93d0a1e80 (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
Diffstat (limited to 'vcl/source/gdi')
| -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 d6f1e4d297f4..e46b7d3bf9e1 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -605,7 +605,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. |