summaryrefslogtreecommitdiff
path: root/editors/openoffice-devel/files
diff options
context:
space:
mode:
authorDon Lewis <truckman@FreeBSD.org>2015-05-08 16:04:20 +0000
committerDon Lewis <truckman@FreeBSD.org>2015-05-08 16:04:20 +0000
commit5061ae835b67439da4b06704aab455cad99cc48f (patch)
tree82c7ebe0fb3ba92a0a304ea84d837664f78455c0 /editors/openoffice-devel/files
parentAdd a patch to fix the HWP filter vulnerability documented in (diff)
Resurrect the part of patch-i114430 that was not accepted upstream.
Submitted by: pfg Approved by: mat (mentor, implicit) MFH: 2015Q2
Notes
Notes: svn path=/head/; revision=385793
Diffstat (limited to 'editors/openoffice-devel/files')
-rw-r--r--editors/openoffice-devel/files/patch-i11443031
1 files changed, 31 insertions, 0 deletions
diff --git a/editors/openoffice-devel/files/patch-i114430 b/editors/openoffice-devel/files/patch-i114430
new file mode 100644
index 000000000000..01d8a2734019
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-i114430
@@ -0,0 +1,31 @@
+Index: sc/source/core/tool/interpr5.cxx
+===================================================================
+--- sc/source/core/tool/interpr5.cxx (revision 1678278)
++++ sc/source/core/tool/interpr5.cxx (working copy)
+@@ -1611,7 +1611,7 @@
+ if (bFlag)
+ { for ( SCSIZE i = 0; i < nCount; i++ )
+ if (pMat->IsValue(i))
+- pResMat->PutDouble(pow(fVal,pMat->GetDouble(i)), i);
++ pResMat->PutDouble(::rtl::math::powr(fVal,pMat->GetDouble(i)), i);
+ else
+ pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i);
+ }
+@@ -1618,7 +1618,7 @@
+ else
+ { for ( SCSIZE i = 0; i < nCount; i++ )
+ if (pMat->IsValue(i))
+- pResMat->PutDouble(pow(pMat->GetDouble(i),fVal), i);
++ pResMat->PutDouble(::rtl::math::powr(pMat->GetDouble(i),fVal), i);
+ else
+ pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i);
+ }
+@@ -1628,7 +1628,7 @@
+ PushIllegalArgument();
+ }
+ else
+- PushDouble(pow(fVal1,fVal2));
++ PushDouble(::rtl::math::powr(fVal1,fVal2));
+ }
+
+ void ScInterpreter::ScSumProduct()