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

[Caolan McNamara]

Author: caolanm

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

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

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch	9 Apr 2009 19:45:48 -0000	1.2
+++ openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch	9 Apr 2009 22:29:36 -0000	1.3
@@ -5,12 +5,21 @@
 diff -u -r1.39.114.1 enhwmf.cxx
 --- openoffice.org.orig/svtools/source/filter.vcl/wmf/enhwmf.cxx	26 Sep 2008 11:25:35 -0000	1.39.114.1
 +++ openoffice.org/svtools/source/filter.vcl/wmf/enhwmf.cxx	8 Apr 2009 11:25:53 -0000
+@@ -337,7 +337,7 @@
+ 				*pWMF >> nPoly >> i;
+ 
+ 				// taking the amount of points of each polygon, retrieving the total number of points
+-				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_UINT32 / sizeof(UINT16) )
++				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_SIZE / sizeof(UINT16) )
+ 				{
+ 					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
+ 					{
 @@ -378,7 +378,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_uInt32)+sizeof(sal_uInt32)) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
++				if ( ( nGesPoints < SAL_MAX_SIZE / sizeof(Point) ) && ( nPoly < SAL_MAX_SIZE / sizeof(UINT16) ) )
  				{
  					if ( ( nPoly * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
  					{
@@ -36,12 +45,30 @@
  						}
  						delete[] pnPoints;
  					}
+@@ -977,7 +977,7 @@
+ 				DBG_ASSERT( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) == 0, "SJ: ETO_PDY || ETO_GLYPH_INDEX in EMF" );
+ 
+ 				Point aPos( ptlReferenceX, ptlReferenceY );
+-				if ( nLen && ( nLen < SAL_MAX_UINT32 / sizeof(sal_Int32) ) )
++				if ( nLen && ( nLen < SAL_MAX_SIZE / sizeof(sal_Int32) ) )
+ 				{
+ 					if ( offDx && (( nCurPos + offDx + nLen * 4 ) <= nNextPos ) )
+ 					{
+@@ -1111,7 +1111,7 @@
+ 				*pWMF >> nPoly >> nGesPoints;
+ 
+ 				// taking the amount of points of each polygon, retrieving the total number of points
+-				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_UINT32 / sizeof(UINT16) )
++				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_SIZE / sizeof(UINT16) )
+ 				{
+ 					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
+ 					{
 @@ -1147,7 +1147,7 @@
  				pWMF->SeekRel( 0x10 );
  				// 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_uInt32)+sizeof(sal_uInt32)) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
++				if ( ( nGesPoints < SAL_MAX_SIZE / sizeof(Point) ) && ( nPoly < SAL_MAX_SIZE / sizeof(UINT16) ) )
  				{
  					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof( UINT16 ) ) <= ( nEndPos - pWMF->Tell() ) )
  					{