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

Caolán McNamara caolanm at redhat.com
Mon Jun 11 11:02:42 UTC 2018


 sc/source/filter/xml/xmlimprt.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bada992cb0ff3fbd9a3e2c5ff2c5d2cc59fa888b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 11 09:06:03 2018 +0100

    coverity#735800 Dereference after null check
    
    Change-Id: I025569d39ed4497938770b7df21fcef32cc83825
    Reviewed-on: https://gerrit.libreoffice.org/55600
    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/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 902070025fe8..36f3c3f8baa9 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1806,7 +1806,7 @@ void SAL_CALL ScXMLImport::endDocument()
         }
 
         // There are rows with optimal height which need to be updated
-        if (!maRecalcRowRanges.empty())
+        if (pDoc && !maRecalcRowRanges.empty())
         {
             bool bLockHeight = pDoc->IsAdjustHeightLocked();
             if (bLockHeight)


More information about the Libreoffice-commits mailing list