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

[Caolán McNamara]

 sc/source/filter/excel/impop.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit f42caebb9c1eec8145c36531a3c7003e91aa6051
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 5 12:06:59 2017 +0000

    ofz#4530 Null-dereference READ
    
    Change-Id: Ibc5fbb021589b22bbcac0062366e2267839b09e7
    Reviewed-on: https://gerrit.libreoffice.org/45873
    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/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 8f02b00dd0cf..f830148594ea 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -851,7 +851,11 @@ void ImportExcel::Shrfmla()
     pFormConv->Reset(aPos);
     pFormConv->Convert( pErgebnis, maStrm, nLenExpr, true, FT_SharedFormula );
 
-    OSL_ENSURE( pErgebnis, "+ImportExcel::Shrfmla(): ScTokenArray is NULL!" );
+    if (!pErgebnis)
+    {
+        SAL_WARN("sc", "+ImportExcel::Shrfmla(): ScTokenArray is NULL!");
+        return;
+    }
 
     pExcRoot->pShrfmlaBuff->Store(aPos, *pErgebnis);