From 5df77f0d3bcc7015139fed8b5a38a93d9242de69 Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane <lionel@mamane.lu>
Date: Thu, 5 Feb 2015 21:35:51 +0100
Subject: make parsing more cautious with exceptions

also handle UNO exceptions that are not RuntimeException

Change-Id: I7050de6ee4b2e4f2af2e0a0be42ba65e0bc028db
---
 sax/source/expatwrap/sax_expat.cxx | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'sax')

diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 2aa30415e0f8..5b02ca902dee 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -124,6 +124,11 @@ OUString XmlChar2OUString( const XML_Char *p )
             pThis->bRTExceptionWasThrown = true; \
             pImpl->rtexception = e; \
         }\
+        catch( const com::sun::star::uno::Exception &e ) {\
+            pThis->bExceptionWasThrown = true; \
+            pThis->bRTExceptionWasThrown = true; \
+            pImpl->rtexception = WrappedTargetRuntimeException("Non-runtime UNO exception caught during parse", e.Context, makeAny(e)); \
+        }\
     }\
     ((void)0)
 
-- 
cgit