summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sc/qa/unit/data/xls/pass/crash-2.xlsbin0 -> 4075 bytes
-rw-r--r--sc/source/filter/excel/impop.cxx6
2 files changed, 6 insertions, 0 deletions
diff --git a/sc/qa/unit/data/xls/pass/crash-2.xls b/sc/qa/unit/data/xls/pass/crash-2.xls
new file mode 100644
index 000000000000..99e485aeecc4
--- /dev/null
+++ b/sc/qa/unit/data/xls/pass/crash-2.xls
Binary files differ
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 4339ae40bca0..e252185456c1 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -662,6 +662,12 @@ void ImportExcel::DefColWidth()
// stored as entire characters -> convert to 1/256 of characters (as in COLINFO)
double fDefWidth = 256.0 * maStrm.ReaduInt16();
+ if (!pColRowBuff)
+ {
+ SAL_WARN("sc", "*ImportExcel::DefColWidth(): pColRowBuff is NULL!");
+ return;
+ }
+
// #i3006# additional space for default width - Excel adds space depending on font size
long nFontHt = GetFontBuffer().GetAppFontData().mnHeight;
fDefWidth += XclTools::GetXclDefColWidthCorrection( nFontHt );