rpms/openoffice.org/F-13 openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch, NONE, 1.1 workspace.writerfilter08.patch, NONE, 1.1 openoffice.org.spec, 1.2199, 1.2200 openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch 
	workspace.writerfilter08.patch 
Removed Files:
	openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch 
Log Message:
Resolves: rhbz#605594 openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch

openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch:
 txttab.cxx |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch ---
diff -ru sw.orig/source/core/text/txttab.cxx sw/source/core/text/txttab.cxx
--- sw.orig/source/core/text/txttab.cxx	2010-06-18 15:03:06.000000000 +0100
+++ sw/source/core/text/txttab.cxx	2010-06-18 15:30:19.000000000 +0100
@@ -194,6 +194,10 @@
             if ( nCount < 0 )
                 nCount = 0;
 
+			//Minimum tab stop width is 1
+			if (nDefTabDist <= 0)
+			    nDefTabDist = 1;
+
 			nCount /= nDefTabDist;
             nNextPos = ( nCount + 1 ) * nDefTabDist ;
             // --> FME 2004-09-21 #117919 Minimum tab stop width is 1 or 51 twips:

workspace.writerfilter08.patch:
 OOXMLFactory.cxx            |   10 ++++++++--
 OOXMLFastContextHandler.cxx |    3 ++-
 2 files changed, 10 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 +154,13 @@
 (OOXMLFastContextHandler * pContext)
 : cppu::WeakImplHelper1<com::sun::star::xml::sax::XFastContextHandler>(),
   mpParent(pContext),
+  mId(0),
+  mnDefine(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.2199
retrieving revision 1.2200
diff -u -p -r1.2199 -r1.2200
--- openoffice.org.spec	14 Jun 2010 14:19:15 -0000	1.2199
+++ openoffice.org.spec	18 Jun 2010 14:43:57 -0000	1.2200
@@ -153,7 +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
+Patch86: workspace.writerfilter08.patch
 Patch87: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
 Patch88: workspace.os140.patch
 Patch89: workspace.vcl112.patch
@@ -161,6 +161,7 @@ Patch90: openoffice.org-3.2.1.pyuno.patc
 Patch91: workspace.ooo321gsl05.patch
 Patch92: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
 Patch93: workspace.gtkfpicker9.patch
+Patch94: openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1744,7 +1745,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
+%patch86 -p0 -b .workspace.writerfilter08.patch
 %patch87 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
 %patch88 -p1 -b .workspace.os140.patch
 %patch89 -p1 -b .workspace.vcl112.patch
@@ -1752,6 +1753,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch91 -p1 -b .workspace.ooo321gsl05.patch
 %patch92 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
 %patch93 -p0 -b .workspace.gtkfpicker9.patch
+%patch94 -p0 -b .ooo112516.sw.avoid.divbyzero.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4237,11 +4239,12 @@ fi
 %endif
 
 %changelog
-* Mon Jun 14 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.25-UNRELEASED
+* Fri Jun 18 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.25-UNRELEASED
 - Resolves: rhbz#602631 dual head fixes add workspace.ooo321gsl05.patch
 - Resolves: rhbz#603298 crash in ImplFontCharMap::GetGlyphIndex
 - Resolves: rhbz#601890/ooo#112384 avoid crash on export to .doc
 - Resolves: rhbz#603043/ooo#112386 improve gtk fpicker stability
+- Resolves: rhbz#605594 openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch
 
 * Sat Jun 05 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.24
 - Resolves: CVE-2010-0395 openoffice.org-3.2.1.pyuno.patch


--- openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch DELETED ---