current/SOURCES/0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch

From 0da2906aa147050c3e99846d5908a60b99df69ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
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

1	From 0da2906aa147050c3e99846d5908a60b99df69ba Mon Sep 17 00:00:00 2001
2	From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
3	Date: Tue, 2 Aug 2011 16:56:30 +0100
4	Subject: [PATCH] Resolves: rhbz#693265 fix crash from unhandled exception
5
6	---
7	vcl/source/gdi/impgraph.cxx \| 28 ++++++++++++++++++++++++----
8	1 files changed, 24 insertions(+), 4 deletions(-)
9
10	diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
11	index 3b6d9a4..6fdb163 100644
12	--- a/vcl/source/gdi/impgraph.cxx
13	+++ b/vcl/source/gdi/impgraph.cxx
14	@@ -1077,7 +1077,14 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap )
15
16	if( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() )
17	{
18	- SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE \| STREAM_SHARE_DENYWRITE );
19	+ SvStream* pOStm = NULL;
20	+ try
21	+ {
22	+ pOStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE \| STREAM_SHARE_DENYWRITE );
23	+ }
24	+ catch( const ::com::sun::star::uno::Exception& )
25	+ {
26	+ }
27
28	if( pOStm )
29	{
30	@@ -1282,8 +1289,14 @@ sal_Bool ImpGraphic::ImplSwapOut()
31
32	if( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() )
33	{
34	- SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE \| STREAM_SHARE_DENYWRITE );
35	-
36	+ SvStream* pOStm = NULL;
37	+ try
38	+ {
39	+ pOStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE \| STREAM_SHARE_DENYWRITE );
40	+ }
41	+ catch( const ::com::sun::star::uno::Exception& )
42	+ {
43	+ }
44	if( pOStm )
45	{
46	pOStm->SetVersion( SOFFICE_FILEFORMAT_50 );
47	@@ -1382,7 +1395,14 @@ sal_Bool ImpGraphic::ImplSwapIn()
48
49	if( aSwapURL.Len() )
50	{
51	- SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aSwapURL, STREAM_READWRITE \| STREAM_SHARE_DENYWRITE );
52	+ SvStream* pIStm = NULL;
53	+ try
54	+ {
55	+ pIStm = ::utl::UcbStreamHelper::CreateStream( aSwapURL, STREAM_READWRITE \| STREAM_SHARE_DENYWRITE );
56	+ }
57	+ catch( const ::com::sun::star::uno::Exception& )
58	+ {
59	+ }
60
61	if( pIStm )
62	{
63	--
64	1.7.6
65