Attachment 157085 Details for Bug 242692 – patch to avoid crash

[patch] patch to avoid crash

avoid.patch (text/plain), 1.78 KB, created by Caolan McNamara on 2007-06-15 09:45:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolan McNamara

Created: 2007-06-15 09:45:32 UTC

Size: 1.78 KB

patch

obsolete

>Index: source/draw/ximpshap.cxx
>===================================================================
>RCS file: /cvs/xml/xmloff/source/draw/ximpshap.cxx,v
>retrieving revision 1.117.8.1
>diff -u -r1.117.8.1 ximpshap.cxx
>--- openoffice.org.orig/xmloff/source/draw/ximpshap.cxx	12 Apr 2007 17:17:24 -0000	1.117.8.1
>+++ openoffice.org/xmloff/source/draw/ximpshap.cxx	15 Jun 2007 09:43:30 -0000
>@@ -615,6 +615,12 @@
> 		{
> 			::basegfx::B2DHomMatrix aTransformation;
> 
>+                	DBG_ASSERT(maSize.Height < SAL_MAX_INT32/2 && maSize.Width < SAL_MAX_INT32/2, "unlikely shape size");
>+#if 0
>+			if (maSize.Height > SAL_MAX_INT32/2 || maSize.Width > SAL_MAX_INT32/2)
>+				maSize.Width = maSize.Height = 1;
>+#endif
>+
> 			if(maSize.Width != 1 || maSize.Height != 1)
> 			{
> 				// take care there are no zeros used by error
>Index: source/sdr/contact/viewobjectcontact.cxx
>===================================================================
>RCS file: /cvs/graphics/svx/source/sdr/contact/viewobjectcontact.cxx,v
>retrieving revision 1.13
>diff -u -r1.13 viewobjectcontact.cxx
>--- openoffice.org.orig/svx/source/sdr/contact/viewobjectcontact.cxx	14 Nov 2006 13:32:04 -0000	1.13
>+++ openoffice.org/svx/source/sdr/contact/viewobjectcontact.cxx	15 Jun 2007 09:43:46 -0000
>@@ -376,13 +376,20 @@
> 			// handle paint of ViewObjectContact
> 			if(GetViewContact().ShouldPaintObject(rDisplayInfo, *this) && rDisplayInfo.DoContinuePaint())
> 			{
>-				if(pRedirector)
>+				try
> 				{
>-					pRedirector->PaintObject(*this, rDisplayInfo);
>+  					if(pRedirector)
>+					{ 
>+						pRedirector->PaintObject(*this, rDisplayInfo);
>+					}
>+					else
>+					{
>+						PaintObject(rDisplayInfo);
>+					}
> 				}
>-				else
>+				catch ( ... )
> 				{
>-					PaintObject(rDisplayInfo);
>+                	DBG_ASSERT(0, "failed to paint object");
> 				}
> 			}
>

Actions: View | Diff

Attachments on bug 242692: 157085