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

[Caolán McNamara]

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

New commits:
commit 040b1fc33384f153a6cd209b58cdf1b2f71cfbd6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 6 20:26:40 2018 +0000

    ofz#4980 bail early with 0 points
    
    even if start is 1 of 0
    
    Change-Id: I7e6ad8bcd20f160e08d8795aa38e52fe3aa3cbee
    Reviewed-on: https://gerrit.libreoffice.org/47515
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
index e4f89420b930..52e86618bd0c 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -494,7 +494,7 @@ namespace emfio
     {
         bool bRecordOk = nPoints <= SAL_MAX_UINT16;
         SAL_WARN_IF(!bRecordOk, "emfio", "polygon record has more polygons than we can handle");
-        if (!bRecordOk)
+        if (!bRecordOk || !nPoints)
             return tools::Polygon();
 
         auto nRemainingSize = std::min(nNextPos - mpInputStream->Tell(), mpInputStream->remainingSize());