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

[Caolán McNamara]

 sw/source/filter/ww8/ww8graf.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b477f791e3e332b41c80782844c4c379212f0fd8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 2 13:53:23 2017 +0000

    ofz#2980 Timeout
    
    Change-Id: Ic5122524d06a1d5c5fccc98acbd5f8d472d39553
    Reviewed-on: https://gerrit.libreoffice.org/44217
    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 44f8630ead1d..1109229f4e58 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -779,7 +779,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
 
     // then determine start and end
     void* pT0;
-    if( !pT->Get( rStartCp, pT0 ) )
+    if (!pT->Get(rStartCp, pT0) || rStartCp < 0)
     {
         OSL_ENSURE( false, "+where's the text graphic (2)?" );
         return false;
@@ -800,7 +800,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
         }
     }
     pT->advance();
-    if( !pT->Get( rEndCp, pT0 ) )
+    if (!pT->Get(rEndCp, pT0) || rEndCp < 0)
     {
         OSL_ENSURE( false, "+where's the text graphic (3)?" );
         return false;