[Libreoffice-commits] core.git: emfio/source

[Caolán McNamara]

 emfio/source/reader/wmfreader.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2624a24af1425c6cb197aa316689f04efd546660
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 26 10:02:09 2018 +0000

    ofz#6563 nBytesPerScan of 0
    
    Change-Id: I00263d06fc06e1b4efb9938ea57d09fa5381adf8
    Reviewed-on: https://gerrit.libreoffice.org/50350
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
index 734954a6e63e..97a7f806c764 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -708,7 +708,7 @@ namespace emfio
                 Point aPoint( ReadYX() );
                 mpInputStream->ReadUInt16( nDontKnow ).ReadUInt16( nWidth ).ReadUInt16( nHeight ).ReadUInt16( nBytesPerScan ).ReadUChar( nPlanes ).ReadUChar( nBitCount );
 
-                bool bOk = nWidth && nHeight && nPlanes == 1 && nBitCount == 1;
+                bool bOk = nWidth && nHeight && nPlanes == 1 && nBitCount == 1 && nBytesPerScan != 0;
                 if (bOk)
                 {
                     bOk = nBytesPerScan <= mpInputStream->remainingSize() / nHeight;