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

[Libreoffice Gerrit user]

 sw/source/core/unocore/unocrsrhelper.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit d3e07a584fc92c548d6356116448e202a2766d11
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Aug 30 16:59:40 2018 +0100
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Mon Sep 3 16:36:17 2018 +0200

    Resolves: tdf#119607 crash in calling getPropertyState on TextParagraph
    
    Change-Id: Ib7091473e3547241e95dc3d3921abf650f288aff
    Reviewed-on: https://gerrit.libreoffice.org/59825
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index ad54ef7383e1..227c08f131bc 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -599,8 +599,11 @@ bool getCursorPropertyValue(const SfxItemPropertySimpleEntry& rEntry
             SwTextNode* pTextNode = rPam.GetPoint()->nNode.GetNode().GetTextNode();
             if (pTextNode)
             {
-                uno::Reference<text::XTextContent> xParagraph = SwXParagraph::CreateXParagraph(*pTextNode->GetDoc(), pTextNode);
-                *pAny <<= xParagraph;
+                if (pAny)
+                {
+                    uno::Reference<text::XTextContent> xParagraph = SwXParagraph::CreateXParagraph(*pTextNode->GetDoc(), pTextNode);
+                    *pAny <<= xParagraph;
+                }
             }
             else
                 eNewState = PropertyState_DEFAULT_VALUE;