rpms/openoffice.org/devel openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch, 1.1, 1.2

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30841

Modified Files:
	openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch 
Log Message:
correct patch

openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch:

Index: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch	8 Apr 2009 11:39:06 -0000	1.1
+++ openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch	9 Apr 2009 19:45:48 -0000	1.2
@@ -10,7 +10,7 @@
  				*pWMF >> nPoly >> nGesPoints;
  
 -				if ( ( nGesPoints < SAL_MAX_UINT32 / sizeof(Point) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
-+				if ( ( nGesPoints < SAL_MAX_UINT32 / (sizeof(sal_uInt16) + sizeof(sal_uInt16)) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
++				if ( ( nGesPoints < SAL_MAX_UINT32 / (sizeof(sal_uInt32)+sizeof(sal_uInt32)) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
  				{
  					if ( ( nPoly * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
  					{
@@ -19,7 +19,7 @@
  						}
  
 -						if ( ( nGesPoints * sizeof(Point) ) <= ( nEndPos - pWMF->Tell() ) )
-+						if ( ( nGesPoints * (sizeof(sal_uInt16) + sizeof(sal_uInt16)) ) <= ( nEndPos - pWMF->Tell() ) )
++						if ( ( nGesPoints * (sizeof(sal_uInt32)+sizeof(sal_uInt32)) ) <= ( nEndPos - pWMF->Tell() ) )
  						{
  							// Polygonpunkte holen:
 -							pPtAry  = (Point*) new char[ nGesPoints * sizeof(Point) ];
@@ -41,7 +41,7 @@
  				// Anzahl der Polygone:
  				*pWMF >> nPoly >> nGesPoints;
 -				if ( ( nGesPoints < SAL_MAX_UINT32 / sizeof(Point) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
-+				if ( ( nGesPoints < SAL_MAX_UINT32 / (sizeof(sal_uInt16) + sizeof(sal_uInt16)) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
++				if ( ( nGesPoints < SAL_MAX_UINT32 / (sizeof(sal_uInt32)+sizeof(sal_uInt32)) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
  				{
  					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof( UINT16 ) ) <= ( nEndPos - pWMF->Tell() ) )
  					{