diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-11-05 16:04:28 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-07 09:20:49 -0600 |
| commit | 893039fa142c6b0188549bda5567d8cb115600fa (patch) | |
| tree | 214be98eaca60b468875690060f04ec220d0c90a | |
| parent | 9826dec6f6021dba9859458acb0eb04520e5979a (diff) | |
Resolves: fdo#58094 don't crash on attempting mml import
Change-Id: I812f2b3e333ea59e9ebfc75a854faca050af8711
(cherry picked from commit 603e9338568c29c01f812c4fd47b7e8138e015bb)
Reviewed-on: https://gerrit.libreoffice.org/6590
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | starmath/source/mathmlimport.cxx | 5 | ||||
| -rw-r--r-- | starmath/source/node.cxx | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 3487a386be29..50c06aa67257 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -2244,10 +2244,11 @@ void SmXMLRowContext_Impl::EndElement() { SmNodeArray aRelationArray; SmNodeStack &rNodeStack = GetSmImport().GetNodeStack(); - sal_uLong nSize = rNodeStack.size()-nElementCount; - if (nSize > 0) + if (rNodeStack.size() > nElementCount) { + sal_uLong nSize = rNodeStack.size() - nElementCount; + aRelationArray.resize(nSize); for (sal_uLong j=nSize;j > 0;j--) { diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index e0c72822f305..469eee1b64ef 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -2511,7 +2511,8 @@ void SmMatrixNode::CreateTextFromNode(String &rText) for (sal_uInt16 j = 0; j < nNumCols; j++) { SmNode *pNode = GetSubNode(i * nNumCols + j); - pNode->CreateTextFromNode(rText); + if (pNode) + pNode->CreateTextFromNode(rText); if (j != nNumCols-1) rText += "# "; } |