Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4224
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/4224/1
Related fdo#33895 add some checks against NULL derefs
Change-Id: I9c62a063788a494125ce8dc27748ed66022f5c48
Reviewed-on: https://gerrit.libreoffice.org/4199
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
---
M writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index c8af924..aae56aa 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1161,8 +1161,13 @@
// Add the data pointed to by the reference as another property.
void OOXMLFastContextHandler::resolveData(const OUString & rId)
{
+ OOXMLDocument * objDocument = getDocument();
+ SAL_WARN_IF(!objDocument, "writerfilter", "no document to resolveData");
+ if (!objDocument)
+ return;
+
uno::Reference<io::XInputStream> xInputStream
- (mpParserState->getDocument()->getInputStreamForId(rId));
+ (objDocument->getInputStreamForId(rId));
OOXMLValue::Pointer_t aValue(new OOXMLInputStreamValue(xInputStream));
--
To view, visit https://gerrit.libreoffice.org/4224
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c62a063788a494125ce8dc27748ed66022f5c48
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Julien Nabet <serval2412@yahoo.fr>
Gerrit-Reviewer: Miklos Vajna <vmiklos@suse.cz>
Context
- [PATCH libreoffice-4-0] Related fdo#33895 add some checks against NULL derefs · Julien Nabet (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.