rpms/openoffice.org/devel workspace.writerfilter08.patch, NONE, 1.1 openoffice.org.spec, 1.2233, 1.2234 openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Fri Jun 4 12:12:52 UTC 2010
- Previous message: rpms/tuned/devel .cvsignore, 1.15, 1.16 sources, 1.19, 1.20 tuned.spec, 1.23, 1.24
- Next message: rpms/make/devel make-3.81-recursion-test.patch, NONE, 1.1 make.spec, 1.49, 1.50
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9739
Modified Files:
openoffice.org.spec
Added Files:
workspace.writerfilter08.patch
Removed Files:
openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch
Log Message:
rename to accepted upstream workspace
workspace.writerfilter08.patch:
OOXMLFactory.cxx | 10 ++++++++--
OOXMLFastContextHandler.cxx | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
--- NEW FILE workspace.writerfilter08.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.2233
retrieving revision 1.2234
diff -u -p -r1.2233 -r1.2234
--- openoffice.org.spec 4 Jun 2010 09:11:33 -0000 1.2233
+++ openoffice.org.spec 4 Jun 2010 12:12:51 -0000 1.2234
@@ -142,7 +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
+Patch75: workspace.writerfilter08.patch
Patch76: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
Patch77: workspace.os140.patch
Patch78: workspace.vcl112.patch
@@ -1702,7 +1702,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
+%patch75 -p0 -b .workspace.writerfilter08.patch
%patch76 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
%patch77 -p1 -b .workspace.os140.patch
%patch78 -p1 -b .workspace.vcl112.patch
--- openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch DELETED ---
- Previous message: rpms/tuned/devel .cvsignore, 1.15, 1.16 sources, 1.19, 1.20 tuned.spec, 1.23, 1.24
- Next message: rpms/make/devel make-3.81-recursion-test.patch, NONE, 1.1 make.spec, 1.49, 1.50
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list