diff options
author | Dmitry Stogov <dmitry@zend.com> | 2015-06-22 12:53:52 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-22 12:53:52 +0300 |
commit | b97df475dfbfe5c7ddd883432eb3bcf3645803e9 (patch) | |
tree | 039436d60f049a37914b9e3030b97dac7c82eb47 /Zend/zend_operators.h | |
parent | 0da4c34f0e5957f4370a22bfcc0043efb1f59955 (diff) | |
download | php-git-b97df475dfbfe5c7ddd883432eb3bcf3645803e9.tar.gz |
Fixed crash in Zend/tests/bug69891.phpt on x86 (32-bit).
compare_function() now has to be compatible with binary_op_type (use fastcall convention).
Introduced new zval_compare_function() to be used as zval comparison callback instead of compare_function().
Diffstat (limited to 'Zend/zend_operators.h')
-rw-r--r-- | Zend/zend_operators.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index 17d1bcffb4..601508ca27 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -327,7 +327,8 @@ again: return result; } -ZEND_API int compare_function(zval *result, zval *op1, zval *op2); +ZEND_API int ZEND_FASTCALL compare_function(zval *result, zval *op1, zval *op2); +ZEND_API int zval_compare_function(zval *result, zval *op1, zval *op2); ZEND_API int numeric_compare_function(zval *result, zval *op1, zval *op2); ZEND_API int string_compare_function_ex(zval *result, zval *op1, zval *op2, zend_bool case_insensitive); ZEND_API int string_compare_function(zval *result, zval *op1, zval *op2); |