[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - filter/source

[Caolán McNamara]

 filter/source/graphicfilter/idxf/dxftblrd.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 2851316853b6c9106d9dc89a8ea4c3ca42eab01e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 24 11:28:47 2017 +0100

    ofz#3759 check for valid starting dash index
    
    Change-Id: I09e117e14eda2565c9b25d407cc4328d4f2ee97a
    Reviewed-on: https://gerrit.libreoffice.org/43802
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/filter/source/graphicfilter/idxf/dxftblrd.cxx b/filter/source/graphicfilter/idxf/dxftblrd.cxx
index 1d2f8b483428..a7b968de6db3 100644
--- a/filter/source/graphicfilter/idxf/dxftblrd.cxx
+++ b/filter/source/graphicfilter/idxf/dxftblrd.cxx
@@ -68,9 +68,14 @@ void DXFLType::Read(DXFGroupReader & rDGR)
                 rDGR.SetError();
                 return;
             }
-            if (nDashIndex<nDashCount)
+            if (nDashIndex < nDashCount)
             {
-                fDash[nDashIndex++]=rDGR.GetF();
+                if (nDashIndex < 0)
+                {
+                    rDGR.SetError();
+                    return;
+                }
+                fDash[nDashIndex++] = rDGR.GetF();
             }
             break;
         }