merge errors

merge errors

Author: LamentXU123

ext/gmp/gmp.c

@@ -1206,11 +1206,7 @@ ZEND_FUNCTION(gmp_powm_sec)
 		RETURN_THROWS();
 	}
 
-	if (!mpz_cmp_ui(gmpnum_mod, 0)) {
-		zend_argument_error(zend_ce_division_by_zero_error, 3, "Modulo by zero");
-		RETURN_THROWS();
-	}
-
+	/* Zero is not odd, so this also rejects a zero modulus. */
 	if (!mpz_odd_p(gmpnum_mod)) {
 		zend_argument_value_error(3, "must be odd");
 		RETURN_THROWS();

ext/gmp/tests/gmp_powm_sec.phpt

@@ -22,16 +22,12 @@ foreach ([0, -1] as $exp) {
     }
 }
 
-try {
-    var_dump(gmp_powm_sec(4, 13, 0));
-} catch (\DivisionByZeroError $e) {
-    echo $e->getMessage(), \PHP_EOL;
-}
-
-try {
-    var_dump(gmp_powm_sec(4, 13, 496));
-} catch (\ValueError $e) {
-    echo $e->getMessage(), \PHP_EOL;
+foreach ([0, 496] as $modulus) {
+    try {
+        var_dump(gmp_powm_sec(4, 13, $modulus));
+    } catch (\ValueError $e) {
+        echo $e->getMessage(), \PHP_EOL;
+    }
 }
 
 echo "Done\n";
@@ -41,6 +37,6 @@ string(3) "445"
 string(1) "5"
 gmp_powm_sec(): Argument #2 ($exponent) must be greater than 0
 gmp_powm_sec(): Argument #2 ($exponent) must be greater than 0
-gmp_powm_sec(): Argument #3 ($modulus) Modulo by zero
+gmp_powm_sec(): Argument #3 ($modulus) must be odd
 gmp_powm_sec(): Argument #3 ($modulus) must be odd
 Done