Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  Fix exception handling in array_multisort()

Author: iluuu1994

NEWS

@@ -7,6 +7,7 @@ PHP                                                                        NEWS
 
 - Standard:
   . Fix access on NULL pointer in array_merge_recursive(). (ilutov)
+  . Fix exception handling in array_multisort(). (ilutov)
 
 01 Jun 2023, PHP 8.2.7
 

Zend/tests/array_multisort_exception.phpt

@@ -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

ext/standard/array.c

@@ -5761,6 +5761,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++) {
@@ -5790,15 +5793,15 @@ PHP_FUNCTION(array_multisort)
 			}
 		}
 	}
+	RETVAL_TRUE;
 
-	/* Clean up. */
+clean_up:
 	for (i = 0; i < array_size; i++) {
 		efree(indirect[i]);
 	}
 	efree(indirect);
 	efree(func);
 	efree(arrays);
-	RETURN_TRUE;
 }
 /* }}} */