diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-04-03 21:35:26 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-04-05 05:45:54 +0000 |
| commit | c909a2562907f6a761a6228fc52020535ce858b1 (patch) | |
| tree | d63b9fdce49a2d6133b2ba258b38cd3a987629d8 | |
| parent | b5966b8f43d9f46e2a6ba89b2f955a3216cdd367 (diff) | |
subtable corruption is possible
Change-Id: Ifbf4312df583724a22328491bea3b6e05b82418f
(cherry picked from commit 9814cf713c57b211f5632733a853150d1d1e8da9)
Reviewed-on: https://gerrit.libreoffice.org/23766
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | lotuswordpro/qa/cppunit/data/fail/subtable-1.lwp | bin | 0 -> 83439 bytes | |||
| -rw-r--r-- | lotuswordpro/source/filter/xfilter/xfcell.cxx | 5 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lotuswordpro/qa/cppunit/data/fail/subtable-1.lwp b/lotuswordpro/qa/cppunit/data/fail/subtable-1.lwp Binary files differnew file mode 100644 index 000000000000..3d906ee68459 --- /dev/null +++ b/lotuswordpro/qa/cppunit/data/fail/subtable-1.lwp diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx index 2a81548eda6b..a8bd647b4f08 100644 --- a/lotuswordpro/source/filter/xfilter/xfcell.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx @@ -88,10 +88,9 @@ void XFCell::Add(XFContent *pContent) Reset(); m_eValueType = enumXFValueTypeNone; } - if( m_pSubTable ) + if (m_pSubTable) { - assert(false); - return; + throw std::runtime_error("subtable already set"); } if (!pContent) { |