diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-06-11 10:12:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-06-11 12:47:18 +0200 |
| commit | 54344deb66b2aca47bfcc9cadcbc0262fc4c138b (patch) | |
| tree | 47b3b99bd1321ff8234a18287eb73dcb33d4040c /emfio | |
| parent | WMF/EMF tdf#59814 tdf#142567 Fix RestoreDC record (diff) | |
| download | core-54344deb66b2aca47bfcc9cadcbc0262fc4c138b.tar.gz core-54344deb66b2aca47bfcc9cadcbc0262fc4c138b.zip | |
ofz#35149 crash in vcl::bitmap::CreateFromData from wmf load
which has started since...
commit 01ded1e6d362dbcd7148334c6965d6ad00981d4a
Date: Tue Jun 8 23:07:28 2021 +0200
WMF tdf#55058 tdf#142722 Add implementation of BitBlt and StretchBlt
Change-Id: I5bbde55dbd9e239c05544ac4a21e2758770245d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117038
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'emfio')
| -rw-r--r-- | emfio/source/reader/wmfreader.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx index 38f6252afa59..f506de102bfe 100644 --- a/emfio/source/reader/wmfreader.cxx +++ b/emfio/source/reader/wmfreader.cxx @@ -841,7 +841,7 @@ namespace emfio if (bOk) { // scanline must be large enough to provide all pixels - bOk = nBytesPerScan >= nWidth / 8; + bOk = nBytesPerScan >= nWidth * nBitCount / 8; } if (bOk) { |