[Libreoffice-commits] core.git: filter/source

[Caolán McNamara]

 filter/source/graphicfilter/iras/iras.cxx |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit aada2feb9f5d21e44ba4cb1ef393ad80789815ff
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 10 21:05:55 2018 +0100

    ofz#7468 catch ras filter exceptions
    
    Change-Id: I544c367e26e6f03bf7e8cd2ed9224dc743bb31a0
    Reviewed-on: https://gerrit.libreoffice.org/52694
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index 6c851837163c..c0d7a6c7fb82 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -391,9 +391,18 @@ sal_uInt8 RASReader::ImplGetByte()
 extern "C" SAL_DLLPUBLIC_EXPORT bool
 iraGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
 {
-    RASReader aRASReader(rStream);
+    bool bRet = false;
 
-    return aRASReader.ReadRAS(rGraphic );
+    try
+    {
+        RASReader aRASReader(rStream);
+        bRet = aRASReader.ReadRAS(rGraphic );
+    }
+    catch (...)
+    {
+    }
+
+    return bRet;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */