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

Caolán McNamara caolanm at redhat.com
Tue Mar 6 21:38:26 UTC 2018


 xmloff/source/text/XMLTextMarkImportContext.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8fbacaccf41c914bb3e8328980b9981018b187fe
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 6 11:46:37 2018 +0000

    ofz#6764 Null-Dereference
    
    Change-Id: Ic4c43d43b673f207123c99cbaca7efc019565c0d
    Reviewed-on: https://gerrit.libreoffice.org/50820
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 28f3f71fdd24..3854f6c7e2da 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -291,7 +291,7 @@ void XMLTextMarkImportContext::EndElement()
                             m_rHelper.GetCursorAsRange()->getStart());
 
                         // check if beginning and end are in same XText
-                        if (xStartRange->getText() == xEndRange->getText())
+                        if (xStartRange.is() && xEndRange.is() && xStartRange->getText() == xEndRange->getText())
                         {
                             // create range for insertion
                             Reference<XTextCursor> xInsertionCursor =


More information about the Libreoffice-commits mailing list