[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - package/source

[Caolán McNamara]

 package/source/xstor/xstorage.cxx |   23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 68c03150c27815a7be98324421a1560a00408724
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 14 10:03:17 2014 +0100

    Resolves: fdo#86485 fix terminate on SAXException on malformed input
    
    SAXException thrown and not caught
    
    (cherry picked from commit 58a96d3ccedbade4f1a8bfbbc4b7d8f1615cfc69)
    
    Change-Id: I874ffbcd457e102b572f398f4e531f4be30ca3d3
    Reviewed-on: https://gerrit.libreoffice.org/12981
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 1858d76..fc80f90 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -5196,7 +5196,28 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getAllRel
     if ( m_pData->m_nStorageType != embed::StorageFormats::OFOPXML )
         throw uno::RuntimeException( THROW_WHERE, uno::Reference< uno::XInterface >() );
 
-    return m_pImpl->GetAllRelationshipsIfAny();
+    uno::Sequence< uno::Sequence< beans::StringPair > > aRet;
+    try
+    {
+        aRet = m_pImpl->GetAllRelationshipsIfAny();
+    }
+    catch (const io::IOException&)
+    {
+        throw;
+    }
+    catch (const uno::RuntimeException&)
+    {
+        throw;
+    }
+    catch (const uno::Exception &)
+    {
+        uno::Any aCaught( ::cppu::getCaughtException() );
+        throw lang::WrappedTargetRuntimeException(THROW_WHERE "Can't getAllRelationships!",
+                                                 uno::Reference< uno::XInterface >(),
+                                                 aCaught);
+    }
+
+    return aRet;
 }
 
 void SAL_CALL OStorage::insertRelationshipByID(  const OUString& sID, const uno::Sequence< beans::StringPair >& aEntry, sal_Bool bReplace  )