fix crash in XclImpSupbook::GetExternName

Change-Id: I1b6f8d5190fae16bdeb1def7887d3121dad6bc16

fix crash in XclImpSupbook::GetExternName
Change-Id: I1b6f8d5190fae16bdeb1def7887d3121dad6bc16
75304346 · Caolán McNamara · 5da3f0f7 · 75304346 · 75304346
Kaydet (Commit) 75304346 authored Eki 05, 2015 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

crash-7.xls sc/qa/unit/data/xls/pass/crash-7.xls +0 -0

xilink.cxx sc/source/filter/excel/xilink.cxx +5 -1

No files found.
--- a/sc/qa/unit/data/xls/pass/crash-7.xls
+++ b/sc/qa/unit/data/xls/pass/crash-7.xls
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -703,7 +703,11 @@ void XclImpSupbook::ReadExternname( XclImpStream& rStrm, ExcelToSc* pFormulaConv

 const XclImpExtName* XclImpSupbook::GetExternName( sal_uInt16 nXclIndex ) const
 {
-    OSL_ENSURE( nXclIndex > 0, "XclImpSupbook::GetExternName - index must be >0" );
+    if (nXclIndex == 0)
+    {
+        SAL_WARN("sc", "XclImpSupbook::GetExternName - index must be >0");
+        return NULL;
+    }
    if (meType == EXC_SBTYPE_SELF || nXclIndex > maExtNameList.size())
        return NULL;
    return &maExtNameList[nXclIndex-1];