Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Optimize truncation to zero scale in bc_raisemod()
  Fix bug75178.phpt on Windows

Author: laruence

ext/bcmath/libbcmath/src/raisemod.c

@@ -38,6 +38,24 @@
 #include "bcmath.h"
 #include "private.h"
 
+
+/* Truncate a number to zero scale.  To avoid sharing issues (refcount and
+   shared n_value) the number is copied, this copy is truncated, and the
+   original number is "freed". */
+
+static void
+_bc_truncate (bc_num *num)
+{
+  bc_num temp;
+
+  temp = bc_new_num ((*num)->n_len, 0);
+  temp->n_sign = (*num)->n_sign;
+  memcpy (temp->n_value, (*num)->n_value, (*num)->n_len);
+  bc_free_num (num);
+  *num = temp;
+}
+
+
 /* Raise BASE to the EXPO power, reduced modulo MOD.  The result is
    placed in RESULT.  If a EXPO is not an integer,
    only the integer part is used.  */
@@ -63,21 +81,21 @@ bc_raisemod (bc_num base, bc_num expo, bc_num mod, bc_num *result, int scale)
   if (power->n_scale != 0)
     {
       bc_rt_warn ("non-zero scale in base");
-      bc_divide (power, BCG(_one_), &power, 0); /*truncate */
+      _bc_truncate (&power);
     }
 
   /* Check the exponent for scale digits. */
   if (exponent->n_scale != 0)
     {
       bc_rt_warn ("non-zero scale in exponent");
-      bc_divide (exponent, BCG(_one_), &exponent, 0); /*truncate */
+      _bc_truncate (&exponent);
     }
 
   /* Check the modulus for scale digits. */
   if (modulus->n_scale != 0)
     {
       bc_rt_warn ("non-zero scale in modulus");
-      bc_divide (modulus, BCG(_one_), &modulus, 0); /*truncate */
+      _bc_truncate (&modulus);
     }
 
   /* Do the calculation. */

ext/bcmath/tests/bug75178-win32.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Bug #75178 (bcpowmod() misbehaves for non-integer base or modulus)
+--SKIPIF--
+<?php
+if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+    die('skip valid only for windows');
+}
+?>
+--FILE--
+<?php
+var_dump(bcpowmod('4.1', '4', '3', 3));
+var_dump(bcpowmod('4', '4', '3.1', 3));
+?>
+===DONE===
+--EXPECT--
+string(5) "1.000"
+string(5) "1.000"
+===DONE===
+bc math warning: non-zero scale in base
+bc math warning: non-zero scale in modulus

ext/bcmath/tests/bug75178.phpt

@@ -3,6 +3,9 @@ Bug #75178 (bcpowmod() misbehaves for non-integer base or modulus)
 --SKIPIF--
 <?php
 if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip Not valid for windows');
+}
 ?>
 --FILE--
 <?php