Skip to content

Fix exception handling in array_multisort() #11302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix exception handling in array_multisort() #11302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Zend/tests/array_multisort_exception.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--TEST--
Exception handling in array_multisort()
--FILE--
<?php
$array = [1 => new DateTime(), 0 => new DateTime()];
array_multisort($array, SORT_STRING);
?>
--EXPECTF--
Fatal error: Uncaught Error: Object of class DateTime could not be converted to string in %s:%d
Stack trace:
#0 %s(%d): array_multisort(Array, 2)
#1 {main}
thrown in %s on line %d
7 changes: 5 additions & 2 deletions ext/standard/array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5589,6 +5589,9 @@ PHP_FUNCTION(array_multisort)

/* Do the actual sort magic - bada-bim, bada-boom. */
zend_sort(indirect, array_size, sizeof(Bucket *), php_multisort_compare, (swap_func_t)array_bucket_p_sawp);
if (EG(exception)) {
goto clean_up;
}

/* Restructure the arrays based on sorted indirect - this is mostly taken from zend_hash_sort() function. */
for (i = 0; i < num_arrays; i++) {
Expand All @@ -5614,15 +5617,15 @@ PHP_FUNCTION(array_multisort)
zend_hash_rehash(hash);
}
}
RETVAL_TRUE;

/* Clean up. */
clean_up:
for (i = 0; i < array_size; i++) {
efree(indirect[i]);
}
efree(indirect);
efree(func);
efree(arrays);
RETURN_TRUE;
}
/* }}} */

Expand Down