feedback

Author: LamentXU123

ext/intl/collator/collator_convert.cpp

@@ -44,11 +44,8 @@ static void collator_set_conversion_error(UErrorCode status, const char *message
 		status = U_MEMORY_ALLOCATION_ERROR;
 	}
 
-	if (INTL_G(current_collator_error)) {
-		intl_error_set(INTL_G(current_collator_error), status, message);
-	} else {
-		intl_error_set(nullptr, status, message);
-	}
+	ZEND_ASSERT(INTL_G(current_collator_error) != nullptr);
+	intl_error_set(INTL_G(current_collator_error), status, message);
 }
 
 /* {{{ collator_convert_hash_item_from_utf8_to_utf16 */
@@ -241,6 +238,7 @@ U_CFUNC zval* collator_convert_object_to_string( zval* obj, zval *rv )
 	if( U_FAILURE( status ) ) {
 		collator_set_conversion_error(status, "Error converting object string from UTF-8 to UTF-16");
 		zval_ptr_dtor( zstr );
+		ZVAL_NULL( zstr );
 		return nullptr;
 	}
 

ext/intl/collator/collator_sort.cpp

@@ -63,8 +63,9 @@ static int collator_regular_compare_function(zval *result, zval *op1, zval *op2)
 
 	ZVAL_NULL(&str1);
 	str1_p  = collator_convert_object_to_string( op1, &str1 );
-	if( str1_p == nullptr )
+	if( str1_p == nullptr ) {
 		return FAILURE;
+	}
 
 	ZVAL_NULL(&str2);
 	str2_p  = collator_convert_object_to_string( op2, &str2 );
@@ -202,8 +203,9 @@ static int collator_icu_compare_function(zval *result, zval *op1, zval *op2)
 {
 	int rc = SUCCESS;
 	zend_string *str1 = collator_zval_to_string(op1);
-	if( str1 == nullptr )
+	if( str1 == nullptr ) {
 		return FAILURE;
+	}
 
 	zend_string *str2 = collator_zval_to_string(op2);
 	if( str2 == nullptr ) {

ext/intl/tests/collator_sort_conversion_error_regular.phpt

@@ -0,0 +1,31 @@
+--TEST--
+Collator::sort() reports conversion errors in SORT_REGULAR comparisons
+--EXTENSIONS--
+intl
+--FILE--
+<?php
+class BadRegularString {
+    public function __toString(): string {
+        return "\xFF";
+    }
+}
+
+$coll = new Collator('en_US');
+$array = [new BadRegularString(), 1];
+
+var_dump($coll->sort($array, Collator::SORT_REGULAR));
+var_dump($array[0] instanceof BadRegularString);
+var_dump($array[1]);
+var_dump(intl_get_error_code() === U_INVALID_CHAR_FOUND);
+echo intl_get_error_message(), "\n";
+var_dump($coll->getErrorCode() === U_INVALID_CHAR_FOUND);
+echo $coll->getErrorMessage(), "\n";
+?>
+--EXPECT--
+bool(false)
+bool(true)
+int(1)
+bool(true)
+Collator::sort(): Error comparing array values: U_INVALID_CHAR_FOUND
+bool(true)
+Collator::sort(): Error comparing array values: U_INVALID_CHAR_FOUND