summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-06-06 11:41:03 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-06-06 12:00:46 +0100
commitfa671cecd4bb2f38a0a9171cfdbb56efddda1cfa (patch)
tree4cd87c7a5185485dbf394d35d25c7619465e81be /writerfilter
parent56ab9c1289ee284fe0f48e46101cbf55e24db1e2 (diff)
add some checks against NULL derefs
Change-Id: I85fbf279991ee361ea081d92d9acc84d36677af1
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.cxx3
-rw-r--r--writerfilter/source/ooxml/OOXMLParserState.cxx3
2 files changed, 6 insertions, 0 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index f4a7924432ea..205f82152dcf 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1335,6 +1335,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 d8b562bf0821..1b9b426962cb 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -125,6 +125,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);
}