rpms/openoffice.org/F-8 workspace.mhu18.patch, NONE, 1.1 openoffice.org.spec, 1.1356, 1.1357

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19391

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.mhu18.patch 
Log Message:
Resolves: rhbz#450650 CVE-2008-2152

workspace.mhu18.patch:

--- NEW FILE workspace.mhu18.patch ---
Index: porting/sal/rtl/source/alloc_global.c
diff -u porting/sal/rtl/source/alloc_global.c:1.3 porting/sal/rtl/source/alloc_global.c:1.3.288.1
--- porting/sal/rtl/source/alloc_global.c:1.3	Tue May  9 00:24:51 2006
+++ porting/sal/rtl/source/alloc_global.c	Mon May 19 00:59:10 2008
@@ -217,9 +217,15 @@
 		int index = (size - 1) >> RTL_MEMALIGN_SHIFT;
 		OSL_ASSERT(RTL_MEMALIGN >= sizeof(sal_Size));
 
+		if (n >= SAL_MAX_SIZE - (RTL_MEMALIGN + RTL_MEMALIGN - 1))
+		{
+			/* requested size too large for roundup alignment */
+			return 0;
+		}
+
 try_alloc:
 		if (index < RTL_MEMORY_CACHED_LIMIT >> RTL_MEMALIGN_SHIFT)
-			addr = (char*)rtl_cache_alloc(g_alloc_table[index]);
+			addr = (char*)rtl_cache_alloc (g_alloc_table[index]);
 		else
 			addr = (char*)rtl_arena_alloc (gp_alloc_arena, &size);
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org.spec,v
retrieving revision 1.1356
retrieving revision 1.1357
diff -u -r1.1356 -r1.1357
--- openoffice.org.spec	17 Apr 2008 06:46:38 -0000	1.1356
+++ openoffice.org.spec	10 Jun 2008 07:51:10 -0000	1.1357
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 6
-%define rh_rpm_release 14
+%define rh_rpm_release 15
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -173,6 +173,7 @@
 Patch91: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
 Patch92: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
 Patch93: workspace.sjfixes03.patch
+Patch94: workspace.mhu18.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1141,6 +1142,7 @@
 %patch91 -p1 -b .ooo87204.toolkit.64bitevent.patch
 %patch92 -p1 -b .ooo85691.vcl.tooltipcolor.patch
 %patch93 -p1 -b .workspace.sjfixes03.patch
+%patch94 -p1 -b .workspace.mhu18.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2855,6 +2857,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Jun 10 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.15
+- Resolves: rhbz#450650 CVE-2008-2152
+
 * Thu Apr 17 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.14
 - Resolves: rhbz#435688 CVE-2007-5745, CVE-2007-5746, CVE-2007-5747, CVE-2008-0320