mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-27 14:13:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #29049 (array sorting via user function/method does not validate

Browse Source 
it).
This commit is contained in:
Ilia Alshanetsky 2004-07-08 17:07:22 +00:00
parent c176a0ae20
commit 79c28f7618
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ext/standard/array.c
View File

@ -569,6 +569,14 @@ static int array_user_compare(const void *a, const void *b TSRMLS_DC)
} }
} }
/* check is comparison function is valid */
#define PHP_ARRAY_CMP_FUNC_CHECK(func_name) \
if (!zend_is_callable(*func_name, 0, NULL)) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid comparison function."); \
BG(user_compare_func_name) = old_compare_func; \
RETURN_FALSE; \
} \
/* {{{ proto bool usort(array array_arg, string cmp_function) /* {{{ proto bool usort(array array_arg, string cmp_function)
Sort an array by values using a user-defined comparison function */ Sort an array by values using a user-defined comparison function */
PHP_FUNCTION(usort) PHP_FUNCTION(usort)
@ -590,6 +598,9 @@ PHP_FUNCTION(usort)
BG(user_compare_func_name) = old_compare_func; BG(user_compare_func_name) = old_compare_func;
RETURN_FALSE; RETURN_FALSE;
} }
PHP_ARRAY_CMP_FUNC_CHECK(BG(user_compare_func_name))
if (zend_hash_sort(target_hash, zend_qsort, array_user_compare, 1 TSRMLS_CC) == FAILURE) { if (zend_hash_sort(target_hash, zend_qsort, array_user_compare, 1 TSRMLS_CC) == FAILURE) {
BG(user_compare_func_name) = old_compare_func; BG(user_compare_func_name) = old_compare_func;
RETURN_FALSE; RETURN_FALSE;
@ -619,6 +630,9 @@ PHP_FUNCTION(uasort)
BG(user_compare_func_name) = old_compare_func; BG(user_compare_func_name) = old_compare_func;
RETURN_FALSE; RETURN_FALSE;
} }
PHP_ARRAY_CMP_FUNC_CHECK(BG(user_compare_func_name))
if (zend_hash_sort(target_hash, zend_qsort, array_user_compare, 0 TSRMLS_CC) == FAILURE) { if (zend_hash_sort(target_hash, zend_qsort, array_user_compare, 0 TSRMLS_CC) == FAILURE) {
BG(user_compare_func_name) = old_compare_func; BG(user_compare_func_name) = old_compare_func;
RETURN_FALSE; RETURN_FALSE;
@ -694,6 +708,9 @@ PHP_FUNCTION(uksort)
BG(user_compare_func_name) = old_compare_func; BG(user_compare_func_name) = old_compare_func;
RETURN_FALSE; RETURN_FALSE;
} }
PHP_ARRAY_CMP_FUNC_CHECK(BG(user_compare_func_name))
if (zend_hash_sort(target_hash, zend_qsort, array_user_key_compare, 0 TSRMLS_CC) == FAILURE) { if (zend_hash_sort(target_hash, zend_qsort, array_user_key_compare, 0 TSRMLS_CC) == FAILURE) {
BG(user_compare_func_name) = old_compare_func; BG(user_compare_func_name) = old_compare_func;
RETURN_FALSE; RETURN_FALSE;