vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-4.wmf |binary
vcl/source/filter/wmf/winwmf.cxx | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit daf1578d752531e2b48d183531d9a4a7cedfc37e
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Aug 31 15:06:27 2015 +0100
check stream status
Change-Id: I27bb289288d319a93201e9c3d703114924ca258c
diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-4.wmf
b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-4.wmf
new file mode 100644
index 0000000..f16b60c
Binary files /dev/null and
b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-4.wmf differ
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index a379d8b..9e446c0 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -650,7 +650,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
pAcc = aBmp.AcquireWriteAccess();
if ( pAcc )
{
- for (sal_uInt16 y = 0; y < nHeight; y++ )
+ for (sal_uInt16 y = 0; y < nHeight && pWMF->good(); ++y)
{
sal_uInt16 x = 0;
for (sal_uInt16 scan = 0; scan < nBytesPerScan; scan++
)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
