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 /ext/standard/array.c | |
| 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 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index fdfb9107d9..a998079d64 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -164,7 +164,7 @@ static void php_set_compare_func(zend_long sort_type) /* {{{ */ case PHP_SORT_REGULAR: default: - ARRAYG(compare_func) = compare_function; + ARRAYG(compare_func) = zval_compare_function; break; } } |