sc/qa/unit/data/xls/pass/crash-3.xls |binary sc/source/filter/excel/impop.cxx | 7 +++++++ 2 files changed, 7 insertions(+)
New commits: commit ce321f45840fb7e34e823af511221faafc6ef200 Author: Caolán McNamara <[email protected]> Date: Sat Oct 3 11:48:14 2015 +0100 xls: Defrowheight345 without pColRowBuff Change-Id: I22be90d7c54b1118f81337bd9e1d97ba3a1fd86e (cherry picked from commit 4eb26f9cae2aacc8d672884283460e86e5c331ca) Reviewed-on: https://gerrit.libreoffice.org/19109 Tested-by: Jenkins <[email protected]> Reviewed-by: David Tardon <[email protected]> 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 0000000..99e485a Binary files /dev/null and b/sc/qa/unit/data/xls/pass/crash-3.xls differ diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index c48244d..0c5614f 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -1053,6 +1053,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 ); }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
