rpms/openoffice.org/devel openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch, NONE, 1.1 openoffice.org.spec, 1.2228, 1.2229

[Caolan McNamara]

Author: caolanm

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

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/devel/openoffice.org.spec,v
retrieving revision 1.2228
retrieving revision 1.2229
diff -u -p -r1.2228 -r1.2229
--- openoffice.org.spec	31 May 2010 13:16:32 -0000	1.2228
+++ openoffice.org.spec	2 Jun 2010 10:03:50 -0000	1.2229
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 19
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -142,6 +142,7 @@ Patch71: openoffice.org-3.2.0.ooo111741.
 Patch72: openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch
 Patch73: workspace.cmcfixes64.patch
 Patch74: workspace.cmcfixes75.patch
+Patch75: 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}
@@ -1697,6 +1698,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch72 -p0 -b .ooo111886.sw.layout.workaround.patch
 %patch73 -p1 -b .workspace.cmcfixes64.patch
 %patch74 -p1 -b .workspace.cmcfixes75.patch
+%patch75 -p0 -b .ooo112027.writerfilter.avoid.recursetodeath.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2390,6 +2392,12 @@ cp -r psprint_config/configuration/ppds/
 # rhbz#465664 to get lucene working for functional help
 sed -i -e "s#URE_MORE_JAVA_CLASSPATH_URLS.*#& file:///usr/share/java/lucene.jar file:///usr/share/java/lucene-contrib/lucene-analyzers.jar file:///usr/share/java/postgresql-jdbc.jar#" $RPM_BUILD_ROOT/%{basisinstdir}/program/fundamentalbasisrc
 
+#%check
+#to-do
+#source ./Linux*Env.Set.sh
+#cd smoketestoo_native
+#SAL_USE_VCLPLUGIN="svp" build
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -4181,6 +4189,9 @@ fi
 %endif
 
 %changelog
+* Wed Jun 02 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.5
+- Resolves: rhbz#598582 openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch
+
 * Mon May 31 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.4
 - Resolves: rhbz#598052 workspace.cmcfixes75.patch