emfio/source/reader/wmfreader.cxx | 2 +-
vcl/qa/cppunit/graphicfilter/data/wmf/fail/ofz35149-1.wmf |binary
2 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 54344deb66b2aca47bfcc9cadcbc0262fc4c138b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Jun 11 10:12:50 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Jun 11 12:47:18 2021 +0200
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 <caol...@redhat.com>
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)
{
diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/ofz35149-1.wmf
b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/ofz35149-1.wmf
new file mode 100644
index 000000000000..f91e3a9fb056
Binary files /dev/null and
b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/ofz35149-1.wmf differ
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
