[Libreoffice-commits] core.git: writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/rtftok/rtfsdrimport.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit ccc0986d9a1c4a90114a38c30fe778ee42c8a8b5
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Aug 1 10:19:52 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Aug 1 13:38:42 2018 +0200

    forcepoint#58 null deref
    
    Change-Id: I826890ec85a16bc05fc1e4cd068079b0f8734d07
    Reviewed-on: https://gerrit.libreoffice.org/58393
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 1d3b9527311e..ae8a6333d720 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -1119,6 +1119,8 @@ void RTFSdrImport::append(const OUString& aKey, const OUString& aValue)
 
 void RTFSdrImport::appendGroupProperty(const OUString& aKey, const OUString& aValue)
 {
+    if (m_aParents.empty())
+        return;
     uno::Reference<drawing::XShape> xShape(m_aParents.top(), uno::UNO_QUERY);
     if (xShape.is())
         applyProperty(xShape, aKey, aValue);