Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix leak in gmp_export()

Author: nikic

ext/gmp/gmp.c

@@ -971,7 +971,7 @@ ZEND_FUNCTION(gmp_export)
 	FETCH_GMP_ZVAL(gmpnumber, gmpnumber_arg, temp_a, 1);
 
 	if (mpz_sgn(gmpnumber) == 0) {
-		RETURN_EMPTY_STRING();
+		RETVAL_EMPTY_STRING();
 	} else {
 		size_t bits_per_word = size * 8;
 		size_t count = (mpz_sizeinbase(gmpnumber, 2) + bits_per_word - 1) / bits_per_word;
@@ -980,7 +980,7 @@ ZEND_FUNCTION(gmp_export)
 		mpz_export(ZSTR_VAL(out_string), NULL, order, size, endian, 0, gmpnumber);
 		ZSTR_VAL(out_string)[ZSTR_LEN(out_string)] = '\0';
 
-		RETURN_NEW_STR(out_string);
+		RETVAL_NEW_STR(out_string);
 	}
 
 	FREE_GMP_TEMP(temp_a);

ext/gmp/tests/gmp_export.phpt

@@ -50,6 +50,9 @@ foreach ($export as $k => $test) {
 
 var_dump($passed);
 
+// Argument converted from int to GMP
+var_dump(bin2hex(gmp_export(0xff)));
+
 // Invalid word sizes
 try {
     var_dump(gmp_export(123, -1));
@@ -76,6 +79,7 @@ try {
 ?>
 --EXPECT--
 bool(true)
+string(2) "ff"
 gmp_export(): Argument #2 ($word_size) must be greater than or equal to 1
 gmp_export(): Argument #2 ($word_size) must be greater than or equal to 1
 gmp_export(): Argument #3 ($flags) cannot use multiple word order options