diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-08-28 15:33:27 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-08-28 21:36:17 +0200 |
commit | bcbada5d9f2411739c83610f2e9fd2acb112c3e9 (patch) | |
tree | da0a339d52bf4a5b4e81eb2953e6f9d3b5ec63e5 /vcl/source/filter | |
parent | 1877c2edd4af4f8a415f5324358da72493075201 (diff) |
Resolves: tdf#111925 we need to take the buffered data len into account
Change-Id: I8aee1f17e6ec1042e7b67942e5bcad0bb3bbf840
Reviewed-on: https://gerrit.libreoffice.org/41644
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/filter')
-rw-r--r-- | vcl/source/filter/ixpm/xpmread.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx index 6c4838af8e68..9d6e8d14b42d 100644 --- a/vcl/source/filter/ixpm/xpmread.cxx +++ b/vcl/source/filter/ixpm/xpmread.cxx @@ -162,7 +162,7 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic ) mbStatus = false; //xpms are a minimum of one character (one byte) per pixel, so if the file isn't //even that long, it's not all there - if (mrIStm.remainingSize() < static_cast<sal_uInt64>(mnWidth) * mnHeight) + if (mrIStm.remainingSize() + mnTempAvail < static_cast<sal_uInt64>(mnWidth) * mnHeight) mbStatus = false; if ( mbStatus && mnWidth && mnHeight && mnColors && mnCpp ) { |