rpms/openoffice.org/F-13 openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch, NONE, 1.1 openoffice.org.spec, 1.2180, 1.2181
Caolan McNamara
caolanm at fedoraproject.org
Fri May 7 08:05:14 UTC 2010
- Previous message: rpms/xapian-core/F-11 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 xapian-core.spec, 1.27, 1.28
- Next message: rpms/openoffice.org/devel openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch, NONE, 1.1 openoffice.org.spec, 1.2210, 1.2211
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30317/F-13
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/F-13/openoffice.org.spec,v
retrieving revision 1.2180
retrieving revision 1.2181
diff -u -p -r1.2180 -r1.2181
--- openoffice.org.spec 5 May 2010 10:09:56 -0000 1.2180
+++ openoffice.org.spec 7 May 2010 08:05:12 -0000 1.2181
@@ -145,6 +145,7 @@ Patch74: openoffice.org-3.3.0.ooo110747.
Patch75: openoffice.org-3.2.0.ooo101131.sw.size.mismatch.patch
Patch76: openoffice.org-3.3.0.ooo93818.sw.postitprint.patch
Patch77: openoffice.org-3.2.0.ooo111286.sw.ignore-null-hint.patch
+Patch78: 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}
@@ -1722,6 +1723,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
%patch75 -p1 -b .ooo101131.sw.size.mismatch.patch
%patch76 -p1 -b .ooo93818.sw.postitprint.patch
%patch77 -p1 -b .ooo111286.sw.ignore-null-hint.patch
+%patch78 -p1 -b .ooo111446.writerfilter.avoidcrash.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4207,8 +4209,9 @@ fi
%endif
%changelog
-* Wed May 05 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.20
+* Fri May 07 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.20
- Related: rhbz#587419 copy attributes correctly (dtardon)
+- Resolves : rhbz#589861 [abrt] crash in DomainMapper_Impl::finishParagraph
* Fri Apr 30 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.19
- Resolves: rhbz#587419 [abrt] crash in SwTxtFtn::CopyFtn (dtardon)
- Previous message: rpms/xapian-core/F-11 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 xapian-core.spec, 1.27, 1.28
- Next message: rpms/openoffice.org/devel openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch, NONE, 1.1 openoffice.org.spec, 1.2210, 1.2211
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list