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

[Caolán McNamara]

 lotuswordpro/qa/cppunit/data/fail/subtable-1.lwp |binary
 lotuswordpro/source/filter/xfilter/xfcell.cxx    |    5 ++---
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit f25eca3f230c170b46d7ce9f40842161a50b1883
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Apr 3 21:35:26 2016 +0100

    subtable corruption is possible
    
    Change-Id: Ifbf4312df583724a22328491bea3b6e05b82418f
    (cherry picked from commit 9814cf713c57b211f5632733a853150d1d1e8da9)
    Reviewed-on: https://gerrit.libreoffice.org/23767
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/lotuswordpro/qa/cppunit/data/fail/subtable-1.lwp b/lotuswordpro/qa/cppunit/data/fail/subtable-1.lwp
new file mode 100644
index 0000000..3d906ee
Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/fail/subtable-1.lwp differ
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx
index 7dde717..523bb1a 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)
     {