rpms/openoffice.org/F-13 openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch, NONE, 1.1 openoffice.org.spec, 1.2190, 1.2191

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch 
Log Message:
Resolves: rhbz#598582 openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch

openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch:
 OOXMLFactory.cxx            |   10 ++++++++--
 OOXMLFastContextHandler.cxx |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch ---
diff -ru writerfilter.orig/source/ooxml/OOXMLFactory.cxx writerfilter/source/ooxml/OOXMLFactory.cxx
--- writerfilter.orig/source/ooxml/OOXMLFactory.cxx	2010-06-02 09:46:43.000000000 +0100
+++ writerfilter/source/ooxml/OOXMLFactory.cxx	2010-06-02 10:51:26.000000000 +0100
@@ -262,8 +264,14 @@
     Id nDefine = pHandler->getDefine();
     
     OOXMLFactory_ns::Pointer_t pFactory = getFactoryForNamespace(nDefine);
-    
-    return createFastChildContextFromFactory(pHandler, pFactory, Element);
+
+    uno::Reference< xml::sax::XFastContextHandler> ret;
+
+    //Avoid handling unknown tokens and recursing to death
+    if ((Element & 0xffff) < OOXML_FAST_TOKENS_END)
+        ret = createFastChildContextFromFactory(pHandler, pFactory, Element);
+
+    return ret;
 }
 
 void OOXMLFactory::characters(OOXMLFastContextHandler * pHandler,
diff -ru writerfilter.orig/source/ooxml/OOXMLFastContextHandler.cxx writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
--- writerfilter.orig/source/ooxml/OOXMLFastContextHandler.cxx	2010-06-02 09:46:43.000000000 +0100
+++ writerfilter/source/ooxml/OOXMLFastContextHandler.cxx	2010-06-02 10:11:28.000000000 +0100
@@ -152,12 +152,12 @@
 (OOXMLFastContextHandler * pContext)
 : cppu::WeakImplHelper1<com::sun::star::xml::sax::XFastContextHandler>(),
   mpParent(pContext),
+  mId(0),
   mnToken(OOXML_FAST_TOKENS_END),
   mpStream(NULL),
   mnTableDepth(0),
   mnInstanceNumber(mnInstanceCount),
   mnRefCount(0),
-  m_xContext(pContext->m_xContext),
   mbFallback(false)
 {
     if (pContext != NULL)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-13/openoffice.org.spec,v
retrieving revision 1.2190
retrieving revision 1.2191
diff -u -p -r1.2190 -r1.2191
--- openoffice.org.spec	31 May 2010 13:16:32 -0000	1.2190
+++ openoffice.org.spec	2 Jun 2010 10:03:50 -0000	1.2191
@@ -153,6 +153,7 @@ Patch82: openoffice.org-3.2.0.ooo111886.
 Patch83: workspace.cmcfixes64.patch
 Patch84: workspace.sw321bf01.patch
 Patch85: workspace.cmcfixes75.patch
+Patch86: openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1736,6 +1737,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch83 -p1 -b .workspace.cmcfixes64.patch
 %patch84 -p1 -b .workspace.sw321bf01.patch
 %patch85 -p1 -b .workspace.cmcfixes75.patch
+%patch86 -p0 -b .ooo112027.writerfilter.avoid.recursetodeath.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4221,11 +4223,12 @@ fi
 %endif
 
 %changelog
-* Mon May 31 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.24.UNRELEASED
+* Wed Jun 02 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)
 
 * 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