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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpdoc.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit dad9627997f4e4d37d31c36b4125e572406af0f2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 28 08:56:11 2017 +0100

    ofz#955 timeout in lwp loading
    
    Change-Id: I3665bd870cd601f2ac7fee59c087034d406ed07c

diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx
index d83da250ddf6..65eb22784ec7 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -613,7 +613,10 @@ LwpDocument* LwpDocument::GetPreviousDivision()
     {
         if(!pRoot->IsChildDoc())
             return pRoot;
-        pRoot = pRoot->GetParentDivision();
+        LwpDocument* pNextRoot = pRoot->GetParentDivision();
+        if (pNextRoot == pRoot)
+            throw std::runtime_error("loop in ParentDivision");
+        pRoot = pNextRoot;
     }
     return nullptr;
 }