diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-10 21:05:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-11 12:03:06 +0200 |
| commit | aada2feb9f5d21e44ba4cb1ef393ad80789815ff (patch) | |
| tree | 28600f68b19e6c5cc8a335ffdffc509397afed8e /filter | |
| parent | a7a1fe1ce77677d069e289b0552860b342f1a505 (diff) | |
ofz#7468 catch ras filter exceptions
Change-Id: I544c367e26e6f03bf7e8cd2ed9224dc743bb31a0
Reviewed-on: https://gerrit.libreoffice.org/52694
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/iras/iras.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
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: */ |