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

[Caolán McNamara]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 226e6b1c4e915498d04136cf1b7ddcc75ef95fc8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 20 12:04:09 2017 +0100

    Resolves: tdf#113230 crash in finishParagraph
    
    Change-Id: I94535a51a87be097ff7356edff935877b42c3272
    Reviewed-on: https://gerrit.libreoffice.org/43599
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 2e32b7eb7f4b..3ad6fb7e8fa7 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4874,7 +4874,10 @@ void DomainMapper_Impl::StartOrEndBookmark( const OUString& rId )
             {
                 uno::Reference< text::XTextCursor > xCursor = xTextAppend->createTextCursorByRange( xTextAppend->getEnd() );
 
-                if(!bIsAfterDummyPara)
+                if (!xCursor)
+                    return;
+
+                if (!bIsAfterDummyPara)
                     bIsStart = !xCursor->goLeft(1, false);
                 xCurrent = xCursor->getStart();
             }