rpms/openoffice.org/devel openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch, NONE, 1.1 openoffice.org.spec, 1.2256, 1.2257

[David Tardon]

Author: dtardon

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1181

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/devel/openoffice.org.spec,v
retrieving revision 1.2256
retrieving revision 1.2257
diff -u -p -r1.2256 -r1.2257
--- openoffice.org.spec	23 Jun 2010 08:05:59 -0000	1.2256
+++ openoffice.org.spec	24 Jun 2010 12:55:39 -0000	1.2257
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 19
-%define rh_rpm_release 17
+%define rh_rpm_release 18
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -153,6 +153,7 @@ Patch82: openoffice.org-3.3.0.ooo112384.
 Patch83: workspace.gtkfpicker9.patch
 Patch84: workspace.gtk3.patch
 Patch85: openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch
+Patch86: openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1719,6 +1720,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch83 -p0 -b .workspace.gtkfpicker9.patch
 %patch84 -p0 -b .workspace.gtk3.patch
 %patch85 -p0 -b .ooo112516.sw.avoid.divbyzero.patch
+%patch86 -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`
@@ -4212,6 +4214,9 @@ fi
 %endif
 
 %changelog
+* Thu Jun 24 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.18
+- Resolves: rhbz#566831 [abrt] crash in GetFrmSize (dtardon)
+
 * Tue Jun 22 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.17
 - more life-cycle issues in cppu and threading