rpms/openoffice.org/F-13 openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch, NONE, 1.1 openoffice.org.spec, 1.2202, 1.2203

[David Tardon]

Author: dtardon

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

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-13/openoffice.org.spec,v
retrieving revision 1.2202
retrieving revision 1.2203
diff -u -p -r1.2202 -r1.2203
--- openoffice.org.spec	21 Jun 2010 09:59:36 -0000	1.2202
+++ openoffice.org.spec	24 Jun 2010 12:53:17 -0000	1.2203
@@ -164,6 +164,7 @@ Patch93: workspace.gtkfpicker9.patch
 Patch94: openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch
 Patch95: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
 Patch96: openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch
+Patch97: 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}
@@ -1758,6 +1759,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch94 -p0 -b .ooo112516.sw.avoid.divbyzero.patch
 %patch95 -p1 -b .ooo107490.cppu.lifecycle.patch
 %patch96 -p0 -b .ooo112567.vcl.embeddedbitmaps.patch
+%patch97 -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`
@@ -4243,8 +4245,9 @@ fi
 %endif
 
 %changelog
-* Mon Jun 21 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.26
+* Thu Jun 24 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.26
 - Resolves: rhbz#606021 openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch
+- Resolves: rhbz#566831 [abrt] crash in GetFrmSize (dtardon)
 
 * Fri Jun 18 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.25
 - Resolves: rhbz#602631 dual head fixes add workspace.ooo321gsl05.patch