From 631ae2debd7601ca046472225c53cd1d49df41a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 2 Aug 2011 17:00:08 +0100 Subject: [PATCH] Resolves: rhbz#693265 fix crash from unhandled exception --- ...3265-fix-crash-from-unhandled-except.patch | 65 +++++++++++++++++++ libreoffice.spec | 7 +- 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch diff --git a/0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch b/0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch new file mode 100644 index 0000000..5ac6ea7 --- /dev/null +++ b/0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch @@ -0,0 +1,65 @@ +From 0da2906aa147050c3e99846d5908a60b99df69ba Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 2 Aug 2011 16:56:30 +0100 +Subject: [PATCH] Resolves: rhbz#693265 fix crash from unhandled exception + +--- + vcl/source/gdi/impgraph.cxx | 28 ++++++++++++++++++++++++---- + 1 files changed, 24 insertions(+), 4 deletions(-) + +diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx +index 3b6d9a4..6fdb163 100644 +--- a/vcl/source/gdi/impgraph.cxx ++++ b/vcl/source/gdi/impgraph.cxx +@@ -1077,7 +1077,14 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) + + if( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() ) + { +- SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | STREAM_SHARE_DENYWRITE ); ++ SvStream* pOStm = NULL; ++ try ++ { ++ pOStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | STREAM_SHARE_DENYWRITE ); ++ } ++ catch( const ::com::sun::star::uno::Exception& ) ++ { ++ } + + if( pOStm ) + { +@@ -1282,8 +1289,14 @@ sal_Bool ImpGraphic::ImplSwapOut() + + if( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() ) + { +- SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | STREAM_SHARE_DENYWRITE ); +- ++ SvStream* pOStm = NULL; ++ try ++ { ++ pOStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | STREAM_SHARE_DENYWRITE ); ++ } ++ catch( const ::com::sun::star::uno::Exception& ) ++ { ++ } + if( pOStm ) + { + pOStm->SetVersion( SOFFICE_FILEFORMAT_50 ); +@@ -1382,7 +1395,14 @@ sal_Bool ImpGraphic::ImplSwapIn() + + if( aSwapURL.Len() ) + { +- SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aSwapURL, STREAM_READWRITE | STREAM_SHARE_DENYWRITE ); ++ SvStream* pIStm = NULL; ++ try ++ { ++ pIStm = ::utl::UcbStreamHelper::CreateStream( aSwapURL, STREAM_READWRITE | STREAM_SHARE_DENYWRITE ); ++ } ++ catch( const ::com::sun::star::uno::Exception& ) ++ { ++ } + + if( pIStm ) + { +-- +1.7.6 + diff --git a/libreoffice.spec b/libreoffice.spec index 3f7a57a..21bcaea 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -27,7 +27,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: 3.4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -118,6 +118,7 @@ Patch23: libreoffice-poppler-0.17.0.patch Patch24: 0001-Resolves-rhbz-715549-use-fontconfig-s-detected-forma.patch Patch25: 0001-this-is-definitely-not-present-in-qt-4.8.0-beta1.patch Patch26: 0001-Resolves-rhbz-725144-wrong-csh-syntax.patch +Patch27: 0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -746,6 +747,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch24 -p1 -b .rhbz715549-use-fontconfig-s-detected-forma.patch %patch25 -p1 -b .this-is-definitely-not-present-in-qt-4.8.0-beta1.patch %patch26 -p1 -b .rhbz725144-wrong-csh-syntax.patch +%patch27 -p1 -b .rhbz693265-fix-crash-from-unhandled-except.patch # these are horribly incomplete--empty translations and copied english # strings with spattering of translated strings @@ -2030,6 +2032,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{basisinstdir}/program/kde-open-url %changelog +* Tue Aug 02 2011 Caolán McNamara - 3.4.2.3-2 +- Resolves: rhbz#693265 fix crash from unhandled exception + * Fri Jul 29 2011 David Tardon - 3.4.2.3-1 - 3.4.2 rc3