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

[Caolán McNamara]

 sw/source/filter/html/htmlsect.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 826cf6f985e790d4e47eec37947eda1c733328c6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 24 11:35:59 2017 +0000

    ofz#4732 Null-dereference
    
    Change-Id: I5ed632702f3a2304902b32aa6ac770586cc4ef34
    Reviewed-on: https://gerrit.libreoffice.org/47044
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 17995c420482..7b256856e4ba 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -826,7 +826,8 @@ void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd,
         if( SfxItemState::SET == pFrameFormat->GetAttrSet().
                 GetItemState( RES_PAGEDESC, false, &pItem ) )
         {
-            pDestContentNd->SetAttr( *pItem );
+            if (pDestContentNd)
+                pDestContentNd->SetAttr(*pItem);
             pFrameFormat->ResetFormatAttr( RES_PAGEDESC );
         }
     }