rpms/openoffice.org/devel openoffice.org-3.3.0.ooo111524.chart2.infcrash.patch, NONE, 1.1 openoffice.org.spec, 1.2217, 1.2218

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.3.0.ooo111524.chart2.infcrash.patch 
Log Message:
Resolves: rhbz#590524 openoffice.org-3.3.0.ooo111524.chart2.infcrash.patch

openoffice.org-3.3.0.ooo111524.chart2.infcrash.patch:
 TickmarkHelper.cxx |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

--- NEW FILE openoffice.org-3.3.0.ooo111524.chart2.infcrash.patch ---
diff -ru chart2.orig/source/view/axes/TickmarkHelper.cxx chart2/source/view/axes/TickmarkHelper.cxx
--- chart2.orig/source/view/axes/TickmarkHelper.cxx	2010-05-10 20:28:32.000000000 +0100
+++ chart2/source/view/axes/TickmarkHelper.cxx	2010-05-11 08:24:48.000000000 +0100
@@ -435,15 +435,17 @@
     if( m_rIncrement.Distance<=0.0)
         return 0;
 
-    sal_Int32 nIntervalCount;
+    double fSub;
     if(m_rIncrement.PostEquidistant  )
-        nIntervalCount = static_cast<sal_Int32>
-                        ( approxSub( m_fScaledVisibleMax, m_fScaledVisibleMin )
-                            / m_rIncrement.Distance );
+        fSub = approxSub( m_fScaledVisibleMax, m_fScaledVisibleMin );
     else
-        nIntervalCount = static_cast<sal_Int32>
-                        ( approxSub( m_rScale.Maximum, m_rScale.Minimum )
-                            / m_rIncrement.Distance );
+        fSub = approxSub( m_rScale.Maximum, m_rScale.Minimum );
+
+    if (!isFinite(fSub))
+        return 0;
+
+    sal_Int32 nIntervalCount = static_cast<sal_Int32>( fSub / m_rIncrement.Distance );
+
     nIntervalCount+=3;
     for(sal_Int32 nN=0; nN<nDepth-1; nN++)
     {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2217
retrieving revision 1.2218
diff -u -p -r1.2217 -r1.2218
--- openoffice.org.spec	10 May 2010 18:54:49 -0000	1.2217
+++ openoffice.org.spec	11 May 2010 07:44:57 -0000	1.2218
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 17
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -135,6 +135,7 @@ Patch64: workspace.vcl111.patch
 Patch65: workspace.sw33bf04.patch
 Patch66: workspace.mba33issues01.patch
 Patch67: openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch
+Patch68: openoffice.org-3.3.0.ooo111524.chart2.infcrash.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1683,6 +1684,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch65 -p1 -b .workspace.sw33bf04.patch
 %patch66 -p1 -b .workspace.mba33issues01.patch
 %patch67 -p0 -b .ooo111446.writerfilter.avoidcrash.patch
+%patch68 -p0 -b .ooo111524.chart2.infcrash.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4166,6 +4168,9 @@ fi
 %endif
 
 %changelog
+* Tue May 11 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-17.3
+- Resolves: rhbz#590524 openoffice.org-3.3.0.ooo111524.chart2.infcrash.patch
+
 * Sat May 08 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-17.2
 - Resolves: rhbz#589861 [abrt] crash in DomainMapper_Impl::finishParagraph