diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-04-03 21:35:26 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-04-04 23:57:24 +0200 |
| commit | b0b14c6825b415828990ddd78fafacf838b098b3 (patch) | |
| tree | 39382cbc1cb183a6d1ee2218488dc638fc813006 | |
| parent | b97a2d4ac6325ffb53d494d6ac3b3d3f9155ed9d (diff) | |
subtable corruption is possible
Change-Id: Ifbf4312df583724a22328491bea3b6e05b82418f
(cherry picked from commit 9814cf713c57b211f5632733a853150d1d1e8da9)
Reviewed-on: https://gerrit.libreoffice.org/23767
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit f25eca3f230c170b46d7ce9f40842161a50b1883)
| -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 7dde717989f3..523bb1a94162 100644 --- a/lotuswordpro/source/filter/xfilter/xfcell.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx @@ -89,10 +89,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) { |