[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/qa sc/source

[Caolán McNamara]

 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 a016ffbf03480549cea53937a90c00bcaf254ee7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Oct 4 08:23:11 2015 +0100

    crash in Standardwidth
    
    Change-Id: I9b781aaf98c16c83e12406ee38167814fb32cfc9
    (cherry picked from commit a28f5f963d16e6355aadd2f27c3348e7679e785b)
    Reviewed-on: https://gerrit.libreoffice.org/19119
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

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 e252185..c48244d 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 );
 }