summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pierre.php@gmail.com>2014-03-10 12:06:40 +0100
committerPierre Joye <pierre.php@gmail.com>2014-03-10 12:06:40 +0100
commitaf41914e15c3c67821ad5f9a0caf11f44b938e4b (patch)
tree97f25540e40a1145d8cc107e5b93f1a5d0c42957
parentcedc718f73fc6ea2f3164f31c6e8bd094ba0f917 (diff)
downloadphp-git-af41914e15c3c67821ad5f9a0caf11f44b938e4b.tar.gz
fix #66872, invalid argument crashes gmp_testbit
-rw-r--r--ext/gmp/gmp.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index 25e8203030..134cc4819a 100644
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -1511,25 +1511,23 @@ ZEND_FUNCTION(gmp_clrbit)
Tests if bit is set in a */
ZEND_FUNCTION(gmp_testbit)
{
- zval **a_arg;
+ zval *a_arg;
long index;
- mpz_t *gmpnum_a;
+ mpz_ptr gmpnum_a;
+ gmp_temp_t temp_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;
}
- if (mpz_tstbit(*gmpnum_a, index)) {
- RETURN_TRUE;
- }
- RETURN_FALSE;
+ FETCH_GMP_ZVAL(gmpnum_a, a_arg, temp_a);
+ RETVAL_BOOL(mpz_tstbit(gmpnum_a, index));
+ FREE_GMP_TEMP(temp_a);
}
/* }}} */