--- embedaddon/php/ext/gmp/gmp.c 2012/02/21 23:47:56 1.1 +++ embedaddon/php/ext/gmp/gmp.c 2014/06/15 20:03:49 1.1.1.5 @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2012 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -667,7 +667,7 @@ static inline void gmp_zval_unary_op(zval *return_valu /* {{{ gmp_zval_unary_ui_op */ -static inline void gmp_zval_unary_ui_op(zval *return_value, zval **a_arg, gmp_unary_ui_op_t gmp_op) +static inline void gmp_zval_unary_ui_op(zval *return_value, zval **a_arg, gmp_unary_ui_op_t gmp_op TSRMLS_DC) { mpz_t *gmpnum_result; @@ -691,7 +691,7 @@ static inline void _gmp_unary_ui_op(INTERNAL_FUNCTION_ return; } - gmp_zval_unary_ui_op(return_value, a_arg, gmp_op); + gmp_zval_unary_ui_op(return_value, a_arg, gmp_op TSRMLS_CC); } /* }}} */ @@ -960,7 +960,7 @@ ZEND_FUNCTION(gmp_mod) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZZ", &a_arg, &b_arg) == FAILURE){ return; - } + } gmp_zval_binary_ui_op_ex(return_value, a_arg, b_arg, mpz_mod, (gmp_binary_ui_op_t)mpz_mod_ui, 1, 1, 0 TSRMLS_CC); } @@ -1022,7 +1022,7 @@ ZEND_FUNCTION(gmp_fact) } } - gmp_zval_unary_ui_op(return_value, a_arg, mpz_fac_ui); + gmp_zval_unary_ui_op(return_value, a_arg, mpz_fac_ui TSRMLS_CC); } /* }}} */ @@ -1069,7 +1069,7 @@ ZEND_FUNCTION(gmp_powm) zval **base_arg, **exp_arg, **mod_arg; mpz_t *gmpnum_base, *gmpnum_exp, *gmpnum_mod, *gmpnum_result; int use_ui = 0; - int temp_base, temp_exp, temp_mod; + int temp_base = 0, temp_exp = 0, temp_mod; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZZZ", &base_arg, &exp_arg, &mod_arg) == FAILURE){ return; @@ -1333,6 +1333,7 @@ ZEND_FUNCTION(gmp_cmp) res = mpz_cmp_si(*gmpnum_a, Z_LVAL_PP(b_arg)); } else { res = mpz_cmp(*gmpnum_a, *gmpnum_b); + FREE_GMP_TEMP(temp_b); } FREE_GMP_TEMP(temp_a); @@ -1528,6 +1529,7 @@ ZEND_FUNCTION(gmp_testbit) if (mpz_tstbit(*gmpnum_a, index)) { RETURN_TRUE; } + RETURN_FALSE; } /* }}} */