rpms/openoffice.org/F-12 openoffice.org-3.3.0.ooo108047.writerfilter.safer-field-context-handling.patch, NONE, 1.1 openoffice.org.spec, 1.2048, 1.2049

[David Tardon]

Author: dtardon

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24080

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/F-12/openoffice.org.spec,v
retrieving revision 1.2048
retrieving revision 1.2049
diff -u -p -r1.2048 -r1.2049
--- openoffice.org.spec	1 Jan 2010 07:23:01 -0000	1.2048
+++ openoffice.org.spec	4 Jan 2010 07:06:01 -0000	1.2049
@@ -184,6 +184,7 @@ Patch107: openoffice.org-3.2.0.ooo47279.
 Patch108: workspace.ooo32gsl03.patch
 Patch109: openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch
 Patch110: workspace.extmgr01.patch
+Patch111: openoffice.org-3.3.0.ooo108047.writerfilter.safer-field-context-handling.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1754,6 +1755,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch108 -p0 -b .workspace.ooo32gsl03.patch
 %patch109 -p0 -b .ooo107834.sw.pseudoattribs.patch
 %patch110 -p1 -b .workspace.extmgr01.patch
+%patch111 -p1 -b .ooo108047.writerfilter.safer-field-context-handling.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4289,6 +4291,8 @@ fi
 %changelog
 * Fri Jan 01 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.25-UNBUILT
 - Resolves: rhbz#549890 add workspace.extmgr01.patch (dtardon)
+- Resolves: rhbz#551983 OpenOffice writer crashes when opening document
+  with link in footnote (dtardon)
 
 * Tue Dec 22 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.24
 - Resolves: rhbz#545824 bustage in writer with emboldened fonts