[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - writerfilter/source

[Caolán McNamara]

 writerfilter/source/dmapper/OLEHandler.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 49fb1b398698db6faa56d340694ee38b1a867a8d
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed Nov 25 14:49:24 2015 +0000

    crashtesting: failure on File_1404.docx
    
    Change-Id: Id984cc1f5954be38fbe3a1a15bfe811d7cdfe99d
    (cherry picked from commit d05ae550316e3dc5afe799c7d6cf83f02e37d69b)
    Reviewed-on: https://gerrit.libreoffice.org/20175
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/writerfilter/source/dmapper/OLEHandler.cxx 
b/writerfilter/source/dmapper/OLEHandler.cxx
index 6208750..d282c7b 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -236,6 +236,8 @@ void 
OLEHandler::importStream(uno::Reference<uno::XComponentContext> xComponentC
     uno::Reference<document::XImporter> xImporter(xInterface, uno::UNO_QUERY);
     uno::Reference<document::XEmbeddedObjectSupplier> xSupplier(xOLE, 
uno::UNO_QUERY);
     uno::Reference<lang::XComponent> 
xEmbeddedObject(xSupplier->getEmbeddedObject(), uno::UNO_QUERY);
+    if (!xEmbeddedObject.is())
+        return;
     xImporter->setTargetDocument( xEmbeddedObject );
 
     // Import the input stream.

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits