rpms/openoffice.org/F-13 workspace.os140.patch, NONE, 1.1 openoffice.org.spec, 1.2192, 1.2193

[David Tardon]

Author: dtardon

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

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/F-13/openoffice.org.spec,v
retrieving revision 1.2192
retrieving revision 1.2193
diff -u -p -r1.2192 -r1.2193
--- openoffice.org.spec	3 Jun 2010 06:37:46 -0000	1.2192
+++ openoffice.org.spec	4 Jun 2010 05:22:17 -0000	1.2193
@@ -155,6 +155,7 @@ Patch84: workspace.sw321bf01.patch
 Patch85: workspace.cmcfixes75.patch
 Patch86: openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch
 Patch87: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
+Patch88: 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}
@@ -1740,6 +1741,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch85 -p1 -b .workspace.cmcfixes75.patch
 %patch86 -p0 -b .ooo112027.writerfilter.avoid.recursetodeath.patch
 %patch87 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
+%patch88 -p1 -b .workspace.os140.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4225,13 +4227,14 @@ fi
 %endif
 
 %changelog
-* Thu Jun 03 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.24.UNRELEASED
+* Fri Jun 04 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.24.UNRELEASED
 - Resolves: rhbz#596807 openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch
 - Protect against broken samba servers (caolanm)
 - Resolves: rhbz#597820 workspace.sw321bf01.patch (dtardon)
 - Resolves: rhbz#598052 workspace.cmcfixes75.patch (caolanm)
 - Resolves: rhbz#598582 openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch (caolanm)
 - Resolves: rhbz#599287 openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch (dtardon)
+- Resolves: rhbz#599585 workspace.os140.patch (dtardon)
 
 * Fri May 21 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.23
 - Resolves: rhbz#594035 openoffice.org-3.3.0.ooo111758.sd.xerror.patch