com php-src: restored the old code in 5.4/5 related to bug #66872: ext/gmp/gmp.c

Commit: 1a624e27a640f776db63934eddbbb50f634e2144 Author: Anatol Belski <ab@php.net> Tue, 11 Mar 2014 11:50:14 +0100 Parents: 4dc8610d34edd497fc3b0c8d22112bf7289db6f6 Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a624e27a640f776db63934eddbbb50f634e2144 Log: restored the old code in 5.4/5 related to bug #66872 The crash is reproducable in 5.6+ only, so 5.4 and 5.5 are fine with the old code. Bugs: https://bugs.php.net/66872 Changed paths: M ext/gmp/gmp.c Diff: diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index 134cc48..f51bd8c 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -1511,23 +1511,26 @@ ZEND_FUNCTION(gmp_clrbit) Tests if bit is set in a */ ZEND_FUNCTION(gmp_testbit) { - zval *a_arg; + zval **a_arg; long index; - mpz_ptr gmpnum_a; - gmp_temp_t temp_a; + mpz_t *gmpnum_a; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zl", &a_arg, &index) == FAILURE){ + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Zl", &a_arg, &index) == FAILURE){ return; } + ZEND_FETCH_RESOURCE(gmpnum_a, mpz_t *, a_arg, -1, GMP_RESOURCE_NAME, le_gmp); + if (index < 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Index must be greater than or equal to zero"); RETURN_FALSE; } - FETCH_GMP_ZVAL(gmpnum_a, a_arg, temp_a); - RETVAL_BOOL(mpz_tstbit(gmpnum_a, index)); - FREE_GMP_TEMP(temp_a); + if (mpz_tstbit(*gmpnum_a, index)) { + RETURN_TRUE; + } + + RETURN_FALSE; } /* }}} */