Return False on invalid encoded string

Girgias · Girgias · commit c0cb68990d43 · 2020-09-08T17:24:15.000+02:00
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
@@ -1303,8 +1303,7 @@ PHP_FUNCTION(mb_ereg_match)
 	}
 
 	if (!php_mb_check_encoding(string, string_len, php_mb_regex_get_mbctype_encoding())) {
-		zend_argument_value_error(2, "must be a valid string in '%s'", php_mb_regex_get_mbctype());
-		RETURN_THROWS();
+		RETURN_FALSE;
 	}
 
 	if ((re = php_mbregex_compile_pattern(arg_pattern, arg_pattern_len, option, syntax)) == NULL) {

Original file line number	Diff line number	Diff line change
`@@ -1303,8 +1303,7 @@ PHP_FUNCTION(mb_ereg_match)`
`1303`	`1303`	`}`
`1304`	`1304`
`1305`	`1305`	`if (!php_mb_check_encoding(string, string_len, php_mb_regex_get_mbctype_encoding())) {`
`1306`		`- zend_argument_value_error(2, "must be a valid string in '%s'", php_mb_regex_get_mbctype());`
`1307`		`- RETURN_THROWS();`
	`1306`	`+ RETURN_FALSE;`
`1308`	`1307`	`}`
`1309`	`1308`
`1310`	`1309`	`if ((re = php_mbregex_compile_pattern(arg_pattern, arg_pattern_len, option, syntax)) == NULL) {`