rpms/openoffice.org/F-8 openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch, NONE, 1.1 openoffice.org.spec, 1.1339, 1.1340

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch 
Log Message:
Resolves: rhbz#426876 add openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch

openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch:

--- NEW FILE openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch ---
Index: source/fontmanager/parseAFM.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/parseAFM.cxx,v
retrieving revision 1.10
diff -u -r1.10 parseAFM.cxx
--- openoffice.org.orig/psprint/source/fontmanager/parseAFM.cxx	21 Dec 2006 11:54:43 -0000	1.10
+++ openoffice.org/psprint/source/fontmanager/parseAFM.cxx	7 Jan 2008 15:32:51 -0000
@@ -285,7 +285,7 @@
         ;
     
     idx = 0;
-    while( ch != -1 && ! is_delimiter_Array[ ch & 255 ] )
+    while( ch != -1 && ! is_delimiter_Array[ ch & 255 ] && idx < MAX_NAME)
     {
         ident[idx++] = ch;
         ch = stream->getChar();


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org.spec,v
retrieving revision 1.1339
retrieving revision 1.1340
diff -u -r1.1339 -r1.1340
--- openoffice.org.spec	2 Jan 2008 11:04:02 -0000	1.1339
+++ openoffice.org.spec	7 Jan 2008 15:44:20 -0000	1.1340
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 6
-%define rh_rpm_release 10
+%define rh_rpm_release 11
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -160,6 +160,7 @@
 Patch78: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
 Patch79: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
 Patch80: openoffice.org-2.3.0.ooo81314.i18npool.crash.patch
+Patch81: openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1115,6 +1116,7 @@
 %patch78 -p1 -b .ooo84676.ucb.davprotocol.patch
 %patch79 -p1 -b .ooo84770.svx.eventsmismatch.patch
 %patch80 -p1 -b .ooo81314.i18npool.crash.patch
+%patch81 -p1 -b .ooo85055.psprint.linetoolong.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2815,6 +2817,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Jan 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.11.UNRELEASED
+- Resolves: rhbz#426876 add openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
+
 * Wed Jan 02 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.10
 - Resolves: rhbz#427071 openoffice.org-2.3.0.ooo81314.i18npool.crash.patch