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

[Caolán McNamara]

 lotuswordpro/source/filter/lwppara.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7fd61a5e182597ddf41bb957dcaef11fe0eef816
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 29 10:54:53 2015 +0000

    return early if Container invalidated
    
    Change-Id: I3983070f1fe447e4b75b956cf95d3b3c5266b3f9
    (cherry picked from commit 78c6be9cf3c9c3c87d2f41981bdc61047171eafe)
    (cherry picked from commit 312ae095c17812f40d08997acc058a1314675af5)
    Reviewed-on: https://gerrit.libreoffice.org/21001
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index 520be75..1825dee 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -253,6 +253,8 @@ void LwpPara::Parse(IXFStream* pOutputStream)
 {
     m_pXFContainer = new XFContentContainer;
     XFConvert(m_pXFContainer);
+    if (!m_pXFContainer)
+        return;
     m_pXFContainer->ToXml(pOutputStream);
     m_pXFContainer->Reset();
     delete m_pXFContainer;