sc/qa/unit/data/xls/pass/crash-6.xls |binary
sc/source/filter/excel/impop.cxx | 5 +++++
2 files changed, 5 insertions(+)
New commits:
commit a28f5f963d16e6355aadd2f27c3348e7679e785b
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Oct 4 08:23:11 2015 +0100
crash in Standardwidth
Change-Id: I9b781aaf98c16c83e12406ee38167814fb32cfc9
diff --git a/sc/qa/unit/data/xls/pass/crash-6.xls
b/sc/qa/unit/data/xls/pass/crash-6.xls
new file mode 100644
index 0000000..19544ba
Binary files /dev/null and b/sc/qa/unit/data/xls/pass/crash-6.xls differ
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index cc3c312..904209d 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -815,6 +815,11 @@ void ImportExcel::Hideobj()
void ImportExcel::Standardwidth()
{
sal_uInt16 nScWidth = XclTools::GetScColumnWidth( maStrm.ReaduInt16(),
GetCharWidth() );
+ if (!pColRowBuff)
+ {
+ SAL_WARN("sc", "*ImportExcel::Standardwidth(): pColRowBuff is NULL!");
+ return;
+ }
pColRowBuff->SetDefWidth( nScWidth, true );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
