rpms/openoffice.org/devel workspace.os140.patch, NONE, 1.1 openoffice.org.spec, 1.2230, 1.2231

[David Tardon]

Author: dtardon

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.os140.patch 
Log Message:
Resolves: rhbz#599585 workspace.os140.patch

workspace.os140.patch:
 nodes.cxx |   18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

--- NEW FILE workspace.os140.patch ---
diff -r f7fde8505c28 sw/source/core/docnode/nodes.cxx
--- a/sw/source/core/docnode/nodes.cxx	Tue Nov 17 13:55:31 2009 +0100
+++ b/sw/source/core/docnode/nodes.cxx	Mon Nov 23 14:54:31 2009 +0100
@@ -2057,11 +2057,19 @@
 
 	// falls aEnd-1 auf keinem ContentNode steht, dann suche den vorherigen
 	aRg.aEnd--;
-	while( (( pAktNode = (*this)[ aRg.aEnd ])->GetStartNode() &&
-			!pAktNode->IsSectionNode() ) ||
-			( pAktNode->IsEndNode() &&
-			ND_STARTNODE == pAktNode->pStartOfSection->GetNodeType()) )
-		aRg.aEnd--;
+    // #i107142#: if aEnd is start node of a special section, do nothing.
+    // Otherwise this could lead to crash: going through all previous
+    // special section nodes and then one before the first.
+    if (aRg.aEnd.GetNode().StartOfSectionIndex() != 0)
+    {
+        while( (( pAktNode = (*this)[ aRg.aEnd ])->GetStartNode() &&
+                !pAktNode->IsSectionNode() ) ||
+                ( pAktNode->IsEndNode() &&
+                ND_STARTNODE == pAktNode->pStartOfSection->GetNodeType()) )
+        {
+            aRg.aEnd--;
+        }
+    }
 	aRg.aEnd++;
 
 	// wird im selben Array's verschoben, dann ueberpruefe die Einfuegepos.


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2230
retrieving revision 1.2231
diff -u -p -r1.2230 -r1.2231
--- openoffice.org.spec	3 Jun 2010 06:41:28 -0000	1.2230
+++ openoffice.org.spec	4 Jun 2010 05:28:47 -0000	1.2231
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 19
-%define rh_rpm_release 6
+%define rh_rpm_release 7
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -144,6 +144,7 @@ Patch73: workspace.cmcfixes64.patch
 Patch74: workspace.cmcfixes75.patch
 Patch75: openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch
 Patch76: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
+Patch77: workspace.os140.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1701,6 +1702,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch74 -p1 -b .workspace.cmcfixes75.patch
 %patch75 -p0 -b .ooo112027.writerfilter.avoid.recursetodeath.patch
 %patch76 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
+%patch77 -p1 -b .workspace.os140.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4191,6 +4193,9 @@ fi
 %endif
 
 %changelog
+* Fri Jun 04 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.7
+- Resolves: rhbz#599585 workspace.os140.patch (dtardon)
+
 * Thu Jun 03 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.6
 - Resolves: rhbz#599287 openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch (dtardon)