[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/qa vcl/source

[Caolán McNamara]

 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 58beafe8301349bfb4f7c83d2583cd4b37463480
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 31 15:06:27 2015 +0100

    check stream status
    
    Change-Id: I27bb289288d319a93201e9c3d703114924ca258c
    (cherry picked from commit daf1578d752531e2b48d183531d9a4a7cedfc37e)
    Reviewed-on: https://gerrit.libreoffice.org/18178
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

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 4667844..0a5fd12 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -627,7 +627,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++ )