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

[Caolán McNamara]

 lotuswordpro/qa/cppunit/data/fail/stack-1.lwp |binary
 lotuswordpro/source/filter/lwptblformula.cxx  |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e68faf7d42179c4f9b90b514f5b3bfcb7f1e9cb0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 14 20:40:15 2017 +0000

    ofz#866 crash in LwpFormulaInfo::ReadArguments
    
    Change-Id: Id301c21c8a4a0556b6326b621171aa62bd939d8d

diff --git a/lotuswordpro/qa/cppunit/data/fail/stack-1.lwp b/lotuswordpro/qa/cppunit/data/fail/stack-1.lwp
new file mode 100644
index 0000000..60eb8e39
Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/fail/stack-1.lwp differ
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index 70eeebb..f926677 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -297,9 +297,9 @@ void LwpFormulaInfo::ReadArguments(LwpFormulaFunc& aFunc)
                 break;
         }
 
-        if (bArgument)
+        if (bArgument && !m_aStack.empty())
         {
-            aFunc.AddArg( m_aStack.back() );
+            aFunc.AddArg(m_aStack.back());
             m_aStack.pop_back();
         }
     }