com php-src: Fixed wrong hash_zval_identical_function: Zend/zend_operators.c
| From: | Dmitry Stogov | Date: | Tue, 25 Feb 2014 10:20:35 +0000 |
| Subject: | com php-src: Fixed wrong hash_zval_identical_function: Zend/zend_operators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77970@lists.php.net to get a copy of this message | ||
Commit: f298ade89a857adaf91dc2aef06b32f5150391cc
Author: Xinchen Hui <laruence@gmail.com> Tue, 25 Feb 2014 18:20:35 +0800
Parents: 499b553c18f1e4e7c09c5f8a20ddc78b7ce70309
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f298ade89a857adaf91dc2aef06b32f5150391cc
Log:
Fixed wrong hash_zval_identical_function
Changed paths:
M Zend/zend_operators.c
Diff:
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 9b46ae4..3f530b6 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -1714,7 +1714,7 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /*
{
}
/* }}} */
-static int hash_zval_identical_function(const zval **z1, const zval **z2) /* {{{ */
+static int hash_zval_identical_function(const zval *z1, const zval *z2) /* {{{ */
{
zval result;
TSRMLS_FETCH();
@@ -1724,7 +1724,7 @@ static int hash_zval_identical_function(const zval **z1, const zval **z2) /*
{{{
* whereas this comparison function is expected to return 0 on identity,
* and non zero otherwise.
*/
- if (is_identical_function(&result, (zval *) *z1, (zval *) *z2 TSRMLS_CC)==FAILURE) {
+ if (is_identical_function(&result, z1, z2 TSRMLS_CC)==FAILURE) {
return 1;
}
return !Z_LVAL(result);