diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-06-06 11:41:03 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-06 19:21:26 +0200 |
| commit | 0aece9e50bd06c16cf15b4cb7d45dd1f98d1800c (patch) | |
| tree | 94a45a624b8c7b0356202b5af83f01b1b86bb28f | |
| parent | 1e07c17c15e814393603bc2bc448ec7e7a57c341 (diff) | |
add some checks against NULL derefs
Change-Id: I85fbf279991ee361ea081d92d9acc84d36677af1
(cherry picked from commit fa671cecd4bb2f38a0a9171cfdbb56efddda1cfa)
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 3 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLParserState.cxx | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 097fb3f97ac0..df9177864f1f 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -1317,6 +1317,9 @@ void OOXMLFastContextHandlerProperties::lcl_endFastElement { if (isForwardEvents()) { + SAL_WARN_IF(!mpStream, "writerfilter", "no stream to set properties on"); + if (!mpStream) + return; mpStream->props(mpPropertySet); } } diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx index 7e9b474ba80c..1352d7376ef1 100644 --- a/writerfilter/source/ooxml/OOXMLParserState.cxx +++ b/writerfilter/source/ooxml/OOXMLParserState.cxx @@ -135,6 +135,9 @@ OOXMLDocument * OOXMLParserState::getDocument() const void OOXMLParserState::setXNoteId(const sal_Int32 nId) { + SAL_WARN_IF(!mpDocument, "writerfilter", "no document to set note id on"); + if (!mpDocument) + return; mpDocument->setXNoteId(nId); } |