rpms/openoffice.org/F-12 openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch, NONE, 1.1 openoffice.org.spec, 1.2094, 1.2095

[David Tardon]

Author: dtardon

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv556

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch 
Log Message:
Resolves: rhbz#566831 [abrt] crash in GetFrmSize

openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch:
 rtftbl.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch ---
# HG changeset patch
# Parent 23574dd1e2de7a4ebb1348b00ae43e1761af672d
#i112657# do not crash when there are merged cells not started by \clmgf at the beginning of a row

diff -r 23574dd1e2de sw/source/filter/rtf/rtftbl.cxx
--- a/sw/source/filter/rtf/rtftbl.cxx	Thu Jun 24 09:29:05 2010 +0200
+++ b/sw/source/filter/rtf/rtftbl.cxx	Thu Jun 24 14:35:01 2010 +0200
@@ -288,7 +288,11 @@
 			break;
 
 		case RTF_CLMRG:
-			aMergeBoxes[ nBoxCnt ] = TRUE;
+            // would crash later on reading \cellx (#i112657#)
+            if (nBoxCnt != 0)
+            {
+                aMergeBoxes[ nBoxCnt ] = TRUE;
+            }
 			break;
 
 		case RTF_CELLX:


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2094
retrieving revision 1.2095
diff -u -p -r1.2094 -r1.2095
--- openoffice.org.spec	14 Jun 2010 14:19:14 -0000	1.2094
+++ openoffice.org.spec	24 Jun 2010 12:49:16 -0000	1.2095
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 33
+%define rh_rpm_release 34
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -212,6 +212,7 @@ Patch133: workspace.mba33issues01.patch
 Patch134: workspace.vcl112.patch
 Patch135: openoffice.org-3.2.1.pyuno.patch
 Patch136: workspace.gtkfpicker9.patch
+Patch137: openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1817,6 +1818,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch134 -p1 -b .workspace.vcl112.patch
 %patch135 -p0 -b .pyuno.patch
 %patch136 -p0 -b .workspace.gtkfpicker9.patch
+%patch137 -p1 -b .ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4362,6 +4364,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Jun 24 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.34-UNBUILT
+- Resolves: rhbz#566831 [abrt] crash in GetFrmSize (dtardon)
+
 * Mon Jun 14 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.33
 - Resolves: rhbz#603043/rhbz#574984/ooo#112386 improve gtk fpicker stability