Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #54598 (bcpowmod() may return 1 if modulus is 1)

Author: cmb69

NEWS

@@ -8,6 +8,7 @@ PHP                                                                        NEWS
 
 - BCMath:
   . Fixed bug #44995 (bcpowmod() fails if scale != 0). (cmb)
+  . Fixed bug #54598 (bcpowmod() may return 1 if modulus is 1). (okano1220, cmb)
 
 - CLI server:
   . Fixed bug #70470 (Built-in server truncates headers spanning over TCP

ext/bcmath/libbcmath/src/raisemod.c

@@ -75,17 +75,24 @@ bc_raisemod (bc_num base, bc_num expo, bc_num mod, bc_num *result, int scale)
 
   /* Do the calculation. */
   rscale = MAX(scale, base->n_scale);
-  while ( !bc_is_zero(exponent) )
+  if ( !bc_compare(mod, BCG(_one_)) )
     {
-      (void) bc_divmod (exponent, BCG(_two_), &exponent, &parity, 0);
-      if ( !bc_is_zero(parity) )
+      temp = bc_new_num (1, scale);
+    }
+  else
+    {
+      while ( !bc_is_zero(exponent) )
 	{
-	  bc_multiply (temp, power, &temp, rscale);
-	  (void) bc_modulo (temp, mod, &temp, scale);
+	  (void) bc_divmod (exponent, BCG(_two_), &exponent, &parity, 0);
+	  if ( !bc_is_zero(parity) )
+	    {
+	      bc_multiply (temp, power, &temp, rscale);
+	      (void) bc_modulo (temp, mod, &temp, scale);
+	    }
+
+	  bc_multiply (power, power, &power, rscale);
+	  (void) bc_modulo (power, mod, &power, scale);
 	}
-
-      bc_multiply (power, power, &power, rscale);
-      (void) bc_modulo (power, mod, &power, scale);
     }
 
   /* Assign the value. */

ext/bcmath/tests/bug54598.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Bug #54598 (bcpowmod() may return 1 if modulus is 1)
+--SKIPIF--
+<?php
+if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
+?>
+--FILE--
+<?php
+var_dump(bcpowmod(5, 0, 1));
+var_dump(bcpowmod(5, 0, 1, 3));
+?>
+===DONE===
+--EXPECT--
+string(1) "0"
+string(5) "0.000"
+===DONE===