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

[Caolán McNamara]

 writerperfect/source/writer/WordPerfectImportFilter.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 81d9f6982a222c8f777a80fdeb89a391b81dd5d3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 8 11:18:33 2015 +0100

    don't crash on loading abi13730-1.wpd
    
    Change-Id: I3796f16c4df8cc055fb1a75b1583c5b959f02799
    (cherry picked from commit 64a252ffa9d0c30bec195a68c6837a0acdeca29a)
    Reviewed-on: https://gerrit.libreoffice.org/19243
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index 389e5b5..f0febb6 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -84,6 +84,9 @@ static bool handleEmbeddedWPGImage(const librevenge::RVNGBinaryData &input, libr
     if (!libwpg::WPGraphics::parse(input.getDataStream(), &aSVGGenerator, fileFormat))
         return false;
 
+    if (svgOutput.empty())
+        return false;
+
     assert(1 == svgOutput.size());
 
     output.clear();