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

[Caolán McNamara]

 sw/source/filter/ww8/ww8graf.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bf565ecf45bcdd3e098576731a2f815d6de2792f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 27 20:28:23 2017 +0100

    ofz#3504 Null-dereference READ
    
    Change-Id: I2e2ad8e9fbbcdb8bc3d60da8b5ddde71b935805e
    Reviewed-on: https://gerrit.libreoffice.org/42875
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 547a54504121..0e24c1b7fbd1 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -666,7 +666,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP nStartCp, WW8_CP nEndCp,
                 }
                 else
                 {
-                    if (!m_aFieldStack.empty() && End_Field())
+                    if (!m_aFieldStack.empty() && End_Field() && !aChunks.empty())
                         aChunks.back().SetEndPos(nStart+1);
                 }
             }