rpms/openoffice.org/devel openoffice.org-3.3.0.ooo108047.writerfilter.safer-field-context-handling.patch, NONE, 1.1 openoffice.org.spec, 1.2115, 1.2116

[David Tardon]

Author: dtardon

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24766

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.3.0.ooo108047.writerfilter.safer-field-context-handling.patch 
Log Message:
Resolves: rhbz#551983 OpenOffice writer crashes when opening document with link in footnote

openoffice.org-3.3.0.ooo108047.writerfilter.safer-field-context-handling.patch:
 DomainMapper_Impl.cxx |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE openoffice.org-3.3.0.ooo108047.writerfilter.safer-field-context-handling.patch ---
diff -r aaadcca77f1f writerfilter/source/dmapper/DomainMapper_Impl.cxx
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx	Sun Dec 20 20:17:35 2009 +0100
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx	Mon Jan 04 07:43:33 2010 +0100
@@ -2578,6 +2578,12 @@
   -----------------------------------------------------------------------*/
 void DomainMapper_Impl::CloseFieldCommand()
 {
+    OSL_ENSURE(!m_aFieldStack.empty(), "no field to close");
+    if (m_aFieldStack.empty())
+    {
+        return;
+    }
+
     FieldContextPtr pContext = m_aFieldStack.top();
     OSL_ENSURE( pContext.get(), "no field context available");
     if( pContext.get() )
@@ -3365,6 +3371,12 @@
   -----------------------------------------------------------------------*/
 void DomainMapper_Impl::PopFieldContext()
 {
+    OSL_ENSURE(!m_aFieldStack.empty(), "no field to pop");
+    if (m_aFieldStack.empty())
+    {
+        return;
+    }
+
     FieldContextPtr pContext = m_aFieldStack.top();
     OSL_ENSURE( pContext.get(), "no field context available");
     if( pContext.get() )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2115
retrieving revision 1.2116
diff -u -p -r1.2115 -r1.2116
--- openoffice.org.spec	4 Jan 2010 01:26:36 -0000	1.2115
+++ openoffice.org.spec	4 Jan 2010 07:08:38 -0000	1.2116
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 8
-%define rh_rpm_release 5 
+%define rh_rpm_release 6
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -131,6 +131,7 @@ Patch53: workspace.pythonssldedux.patch
 Patch54: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
 Patch55: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 Patch56: openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch
+Patch57: openoffice.org-3.3.0.ooo108047.writerfilter.safer-field-context-handling.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1680,6 +1681,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch54 -p1 -b .ooo106502.svx.fixspelltimer.patch
 %patch55 -p0 -b .ooo47279.sd.objectsave.safe.patch
 %patch56 -p0 -b .ooo107834.sw.pseudoattribs.patch
+%patch57 -p1 -b .ooo108047.writerfilter.safer-field-context-handling.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4186,6 +4188,10 @@ fi
 %endif
 
 %changelog
+* Mon Jan 04 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-8.6-UNBUILT
+- Resolves: rhbz#551983 OpenOffice writer crashes when opening document
+  with link in footnote (dtardon)
+
 * Sun Jan 03 2010 Rex Dieter <rdieter at fedoraproject.org> - 1:3.2.0-8.5
 - rebuild (rasqal/redland)