summaryrefslogtreecommitdiff
path: root/lotuswordpro
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-03-14 20:40:15 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-03-14 20:41:32 +0000
commite68faf7d42179c4f9b90b514f5b3bfcb7f1e9cb0 (patch)
treea428f9053de8e406c7ca91453aaa65d66b86287f /lotuswordpro
parent1565c6bed3289f8f14b311b17ffb2e99d155bddb (diff)
ofz#866 crash in LwpFormulaInfo::ReadArguments
Change-Id: Id301c21c8a4a0556b6326b621171aa62bd939d8d
Diffstat (limited to 'lotuswordpro')
-rw-r--r--lotuswordpro/qa/cppunit/data/fail/stack-1.lwpbin0 -> 6074 bytes
-rw-r--r--lotuswordpro/source/filter/lwptblformula.cxx4
2 files changed, 2 insertions, 2 deletions
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 000000000000..60eb8e393e99
--- /dev/null
+++ b/lotuswordpro/qa/cppunit/data/fail/stack-1.lwp
Binary files differ
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index 70eeebb1cf3f..f9266770ca86 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();
}
}