summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-10-03 11:48:14 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-10-03 11:54:32 +0100
commit4eb26f9cae2aacc8d672884283460e86e5c331ca (patch)
tree116255c13cef04fe8d7aaa918e29a3bca84cb27a
parentbf3dd18cf86fd45882b813d08c3df5d7cd097246 (diff)
xls: Defrowheight345 without pColRowBuff
Change-Id: I22be90d7c54b1118f81337bd9e1d97ba3a1fd86e
-rw-r--r--sc/qa/unit/data/xls/pass/crash-3.xlsbin0 -> 4075 bytes
-rw-r--r--sc/source/filter/excel/impop.cxx7
2 files changed, 7 insertions, 0 deletions
diff --git a/sc/qa/unit/data/xls/pass/crash-3.xls b/sc/qa/unit/data/xls/pass/crash-3.xls
new file mode 100644
index 000000000000..99e485aeecc4
--- /dev/null
+++ b/sc/qa/unit/data/xls/pass/crash-3.xls
Binary files differ
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index e252185456c1..9b11b315de9f 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -1048,6 +1048,13 @@ void ImportExcel::Defrowheight345()
sal_uInt16 nFlags, nDefHeight;
nFlags = maStrm.ReaduInt16();
nDefHeight = maStrm.ReaduInt16();
+
+ if (!pColRowBuff)
+ {
+ SAL_WARN("sc", "*ImportExcel::Defrowheight345(): pColRowBuff is NULL!");
+ return;
+ }
+
pColRowBuff->SetDefHeight( nDefHeight, nFlags );
}