rpms/openoffice.org/devel openoffice.org-3.2.0.ooo107552.vcl.sft.patch, NONE, 1.1 openoffice.org.spec, 1.2096, 1.2097

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo107552.vcl.sft.patch 
Log Message:
Resolves: rhbz#544218 add openoffice.org-3.2.0.ooo107552.vcl.sft.patch

openoffice.org-3.2.0.ooo107552.vcl.sft.patch:
 sft.cxx |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-3.2.0.ooo107552.vcl.sft.patch ---
--- vcl/source/fontsubset/sft.cxx	2009-12-09 10:16:54.000000000 +0000
+++ vcl/source/fontsubset/sft.cxx	2009-12-09 10:17:54.000000000 +0000
@@ -1094,6 +1094,14 @@
 	const sal_uInt8* table = getTable( t, O_name );
     int nTableSize = getTableSize(t, O_name);
 
+    if (nTableSize < 4)
+    {
+#if OSL_DEBUG_LEVEL > 1
+        fprintf(stderr, "O_name table too small\n");
+#endif
+        return;
+    }
+
     sal_uInt16 n = GetUInt16(table, 2, 1);
     int i, r;
     sal_Bool bPSNameOK = sal_True;
@@ -1681,7 +1689,6 @@
         goto cleanup;
     }
 
-
     if (((*ttf)->ptr = (sal_uInt8 *) mmap(0, (*ttf)->fsize, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) {
         ret = SF_MEMORY;
         goto cleanup;
@@ -2702,7 +2709,7 @@
     }
 
     table = getTable(ttf, O_post);
-    if (table) {
+    if (table && getTableSize(ttf, O_post) >= 12+sizeof(sal_uInt32)) {
         info->pitch  = GetUInt32(table, 12, 1);
         info->italicAngle = GetInt32(table, 4, 1);
     }
@@ -2808,6 +2815,15 @@
 {
     const sal_uInt8* table = getTable(ttf, O_name);
     int nTableSize = getTableSize(ttf, O_name );
+
+    if (nTableSize < 6)
+    {
+#if OSL_DEBUG_LEVEL > 1
+        fprintf(stderr, "O_name table too small\n");
+#endif
+        return 0;
+    }
+
     sal_uInt16 n = GetUInt16(table, 2, 1);
     int nStrBase = GetUInt16(table, 4, 1);
     int i;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2096
retrieving revision 1.2097
diff -u -p -r1.2096 -r1.2097
--- openoffice.org.spec	4 Dec 2009 09:37:22 -0000	1.2096
+++ openoffice.org.spec	9 Dec 2009 10:26:20 -0000	1.2097
@@ -133,6 +133,7 @@ Patch55: openoffice.org-3.3.0.ooo102645.
 Patch56: workspace.vcl108.patch
 Patch57: workspace.pythonssldedux.patch
 Patch58: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch59: openoffice.org-3.2.0.ooo107552.vcl.sft.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1660,6 +1661,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch56 -p0 -b .workspace.vcl108.patch
 %patch57 -p1 -b .workspace.pythonssldedux.patch
 %patch58 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch59 -p0 -b .ooo107552.vcl.sft.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4162,8 +4164,9 @@ fi
 %endif
 
 %changelog
-* Fri Dec 04 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-7.2
+* Wed Dec 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-7.2
 - Resolves: rhbz#544124 add openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+- Resolves: rhbz#544218 add openoffice.org-3.2.0.ooo107552.vcl.sft.patch
 
 * Thu Dec 03 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-7.1
 - latest milestone