[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - filter/source

[Libreoffice Gerrit user]

 filter/source/xsltfilter/OleHandler.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9a0e5aeca5a118e748e625f6ecbd49a497b8e232
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Aug 1 11:36:01 2018 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Fri Aug 3 10:53:58 2018 +0200

    forcepoint#63 null deref
    
    Change-Id: Ib22ff870cd0d8cdd2350b2aa8698f5a2e3866bdc
    Reviewed-on: https://gerrit.libreoffice.org/58411
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx
index 63728d54d5f3..3ad12a9dfa1a 100644
--- a/filter/source/xsltfilter/OleHandler.cxx
+++ b/filter/source/xsltfilter/OleHandler.cxx
@@ -97,7 +97,7 @@ namespace XSLT
     OString
     OleHandler::encodeSubStorage(const OUString& streamName)
     {
-        if (!m_storage->hasByName(streamName))
+        if (!m_storage || !m_storage->hasByName(streamName))
             {
                 return "Not Found:";// + streamName;
             }