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:20:31 +0200 |
| commit | 81b23a2aad0ab1a72cc292f1b3fca663363c4fee (patch) | |
| tree | 39c02e25414e4548ecb5ed0855965b0ddc7d70b6 | |
| parent | ecde9ba00dcf8c1bf3413afd0281236e9429148f (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 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 c2dc79c3e847..49423756784f 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); } |