rpms/openoffice.org/devel openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch, NONE, 1.1 openoffice.org.spec, 1.2210, 1.2211

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch 
Log Message:
Resolves : rhbz#589861 [abrt] crash in DomainMapper_Impl::finishParagraph

openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch:
 DomainMapper.cxx             |    2 ++
 DomainMapperTableManager.cxx |    3 +++
 DomainMapper_Impl.cxx        |    2 ++
 3 files changed, 7 insertions(+)

--- NEW FILE openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch ---
diff -ru writerfilter.orig/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/DomainMapper.cxx
--- writerfilter.orig/source/dmapper/DomainMapper.cxx	2010-05-07 08:42:15.000000000 +0100
+++ writerfilter/source/dmapper/DomainMapper.cxx	2010-05-07 08:55:34.000000000 +0100
@@ -4249,6 +4249,8 @@
 {
     //handle unprocessed deferred breaks
     PropertyMapPtr pParaProperties = m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH);
+    if (!pParaProperties)
+        return;
     if( pParaProperties->hasEmptyPropertyValues() )
     {
         PropertyMap::const_iterator aIter = pParaProperties->find(PropertyDefinition( PROP_BREAK_TYPE , false ) );
diff -ru writerfilter.orig/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx
--- writerfilter.orig/source/dmapper/DomainMapper_Impl.cxx	2010-05-07 08:42:15.000000000 +0100
+++ writerfilter/source/dmapper/DomainMapper_Impl.cxx	2010-05-07 08:53:32.000000000 +0100
@@ -846,6 +846,8 @@
 #endif
 
     ParagraphPropertyMap* pParaContext = dynamic_cast< ParagraphPropertyMap* >( pPropertyMap.get() );
+    if (!pParaContext)
+        return;
     TextAppendContext& rAppendContext = m_aTextAppendStack.top();
     uno::Reference< text::XTextAppend >  xTextAppend = rAppendContext.xTextAppend;
     PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
diff -ru writerfilter.orig/source/dmapper/DomainMapperTableManager.cxx writerfilter/source/dmapper/DomainMapperTableManager.cxx
--- writerfilter.orig/source/dmapper/DomainMapperTableManager.cxx	2010-05-07 08:42:15.000000000 +0100
+++ writerfilter/source/dmapper/DomainMapperTableManager.cxx	2010-05-07 08:57:17.000000000 +0100
@@ -321,6 +321,9 @@
 
 void DomainMapperTableManager::endLevel( )
 {
+    if (m_aTableGrid.empty() || m_aGridSpans.empty())
+        return;
+
     m_aTableGrid.pop_back( );
     m_aGridSpans.pop_back( );
     m_nTableWidth = 0;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2210
retrieving revision 1.2211
diff -u -p -r1.2210 -r1.2211
--- openoffice.org.spec	6 May 2010 19:29:37 -0000	1.2210
+++ openoffice.org.spec	7 May 2010 08:05:14 -0000	1.2211
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 17
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -136,6 +136,7 @@ Patch65: workspace.vcl111.patch
 Patch66: workspace.sw33bf04.patch
 Patch67: openoffice.org-3.3.0.ooo93818.sw.postitprint.patch
 Patch68: openoffice.org-3.2.0.ooo111286.sw.ignore-null-hint.patch
+Patch69: openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1685,6 +1686,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch66 -p1 -b .workspace.sw33bf04.patch
 %patch67 -p1 -b .ooo93818.sw.postitprint.patch
 %patch68 -p1 -b .ooo111286.sw.ignore-null-hint.patch
+%patch69 -p1 -b .ooo111446.writerfilter.avoidcrash.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4168,6 +4170,9 @@ fi
 %endif
 
 %changelog
+* Fri May 07 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-17.2
+- Resolves: rhbz#589861 [abrt] crash in DomainMapper_Impl::finishParagraph
+
 * Thu May 06 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-17.1
 - latest milestone