feedback

Author: LamentXU123

ext/intl/collator/collator_convert.cpp

@@ -181,6 +181,7 @@ U_CFUNC zval* collator_convert_zstr_utf16_to_utf8( zval* utf16_zval, zval *rv )
 		(UChar*) Z_STRVAL_P(utf16_zval), UCHARS( Z_STRLEN_P(utf16_zval) ), &status );
 	if( !u8str ) {
 		collator_set_conversion_error(status, "Error converting string from UTF-16 to UTF-8");
+		ZVAL_NULL( rv );
 		return nullptr;
 	}
 

ext/intl/collator/collator_sort.cpp

@@ -212,7 +212,6 @@ static int collator_numeric_compare_function(zval *result, zval *op1, zval *op2)
 */
 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 ) {
 		return FAILURE;
@@ -234,7 +233,7 @@ static int collator_icu_compare_function(zval *result, zval *op1, zval *op2)
 	zend_string_release(str1);
 	zend_string_release(str2);
 
-	return rc;
+	return SUCCESS;
 }
 /* }}} */
 

ext/intl/tests/collator_sort_conversion_error_regular.phpt

@@ -18,10 +18,14 @@ var_dump($array[0] instanceof BadRegularString);
 var_dump($array[1]);
 var_dump($coll->getErrorCode() === U_INVALID_CHAR_FOUND);
 echo $coll->getErrorMessage(), "\n";
+var_dump(intl_get_error_code() === U_INVALID_CHAR_FOUND);
+echo intl_get_error_message(), "\n";
 
 $array = ['a', new BadRegularString()];
 var_dump($coll->sort($array, Collator::SORT_REGULAR));
 var_dump($coll->getErrorCode() === U_INVALID_CHAR_FOUND);
+var_dump(intl_get_error_code() === U_INVALID_CHAR_FOUND);
+echo intl_get_error_message(), "\n";
 var_dump($array[0], $array[1] instanceof BadRegularString);
 
 $array = ['10', '9'];
@@ -40,8 +44,12 @@ bool(true)
 int(1)
 bool(true)
 Collator::sort(): Error converting object string from UTF-8 to UTF-16: U_INVALID_CHAR_FOUND
+bool(true)
+Collator::sort(): Error converting object string from UTF-8 to UTF-16: U_INVALID_CHAR_FOUND
 bool(false)
 bool(true)
+bool(true)
+Collator::sort(): Error converting object string from UTF-8 to UTF-16: U_INVALID_CHAR_FOUND
 string(1) "a"
 bool(true)
 bool(true)