archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/gmp: Use zend_string to GMP object function directly

Browse source
This commit is contained in:
Gina Peter Bnayard 2024-08-11 17:50:23 +02:00
parent d74b513f68
commit f8626638c4
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/gmp/gmp.c
View file

@ -179,6 +179,7 @@ if (IS_GMP(zval)) { \
gmp_create(return_value, &gmpnumber) gmp_create(return_value, &gmpnumber)
static void gmp_strval(zval *result, mpz_t gmpnum, int base); static void gmp_strval(zval *result, mpz_t gmpnum, int base);
static zend_result convert_zstr_to_gmp(mpz_t gmp_number, const zend_string *val, zend_long base, uint32_t arg_pos);
static zend_result convert_to_gmp(mpz_t gmpnumber, zval *val, zend_long base, uint32_t arg_pos); static zend_result convert_to_gmp(mpz_t gmpnumber, zval *val, zend_long base, uint32_t arg_pos);
static void gmp_cmp(zval *return_value, zval *a_arg, zval *b_arg, bool is_operator); static void gmp_cmp(zval *return_value, zval *a_arg, zval *b_arg, bool is_operator);
@ -493,7 +494,7 @@ static int gmp_unserialize(zval *object, zend_class_entry *ce, const unsigned ch
zv = var_tmp_var(&unserialize_data); zv = var_tmp_var(&unserialize_data);
if (!php_var_unserialize(zv, &p, max, &unserialize_data) if (!php_var_unserialize(zv, &p, max, &unserialize_data)
|| Z_TYPE_P(zv) != IS_STRING || Z_TYPE_P(zv) != IS_STRING
|| convert_to_gmp(gmpnum, zv, 10, 0) == FAILURE || convert_zstr_to_gmp(gmpnum, Z_STR_P(zv), 10, 0) == FAILURE
) { ) {
zend_throw_exception(NULL, "Could not unserialize number", 0); zend_throw_exception(NULL, "Could not unserialize number", 0);
goto exit; goto exit;
@ -2108,7 +2109,7 @@ ZEND_METHOD(GMP, __unserialize)
zval *num = zend_hash_index_find(data, 0); zval *num = zend_hash_index_find(data, 0);
if (!num || Z_TYPE_P(num) != IS_STRING || if (!num || Z_TYPE_P(num) != IS_STRING ||
convert_to_gmp(GET_GMP_FROM_ZVAL(ZEND_THIS), num, 16, 0) == FAILURE) { convert_zstr_to_gmp(GET_GMP_FROM_ZVAL(ZEND_THIS), Z_STR_P(num), 16, /* arg_pos */ 0) == FAILURE) {
zend_throw_exception(NULL, "Could not unserialize number", 0); zend_throw_exception(NULL, "Could not unserialize number", 0);
RETURN_THROWS(); RETURN_THROWS();
} }