Use zend_str_has_nul_byte to directly throw error

Author: LamentXU123

ext/standard/string.c

@@ -4837,16 +4837,12 @@ PHP_FUNCTION(strip_tags)
 }
 /* }}} */
 
-static zend_string *try_setlocale_str(zend_long cat, zend_string *loc, uint32_t arg_num) {
+static zend_string *try_setlocale_str(zend_long cat, zend_string *loc) {
 	const char *retval;
 
 	if (zend_string_equals_literal(loc, "0")) {
 		loc = NULL;
 	} else {
-		if (zend_str_has_nul_byte(loc)) {
-			zend_argument_value_error(arg_num, "must not contain any null bytes");
-			return NULL;
-		}
 		if (ZSTR_LEN(loc) >= 255) {
 			php_error_docref(NULL, E_WARNING, "Specified locale name is too long");
 			return NULL;
@@ -4907,13 +4903,18 @@ static zend_string *try_setlocale_str(zend_long cat, zend_string *loc, uint32_t
 	return zend_string_init(retval, strlen(retval), 0);
 }
 
-static zend_string *try_setlocale_zval(zend_long cat, zval *loc_zv, uint32_t arg_num) {
+static zend_string *try_setlocale_zval(zend_long cat, zval *loc_zv) {
 	zend_string *tmp_loc_str;
 	zend_string *loc_str = zval_try_get_tmp_string(loc_zv, &tmp_loc_str);
 	if (UNEXPECTED(loc_str == NULL)) {
 		return NULL;
 	}
-	zend_string *result = try_setlocale_str(cat, loc_str, arg_num);
+	if (zend_str_has_nul_byte(loc_str)) {
+		zend_argument_value_error(2, "must not contain any null bytes");
+		zend_tmp_string_release(tmp_loc_str);
+		return NULL;
+	}
+	zend_string *result = try_setlocale_str(cat, loc_str);
 	zend_tmp_string_release(tmp_loc_str);
 	return result;
 }
@@ -4934,8 +4935,11 @@ PHP_FUNCTION(setlocale)
 	zend_string **strings = do_alloca(sizeof(zend_string *) * num_args, use_heap);
 
 	for (uint32_t i = 0; i < num_args; i++) {
-		if (UNEXPECTED(Z_TYPE(args[i]) != IS_ARRAY && !zend_parse_arg_str(&args[i], &strings[i], true, i + 2))) {
-			zend_wrong_parameter_type_error(i + 2, Z_EXPECTED_ARRAY_OR_STRING_OR_NULL, &args[i]);
+		if (UNEXPECTED(Z_TYPE(args[i]) != IS_ARRAY && !zend_parse_arg_path_str(&args[i], &strings[i], true, i + 2))) {
+			zend_wrong_parameter_type_error(
+				i + 2,
+				Z_TYPE(args[i]) == IS_STRING ? Z_EXPECTED_PATH : Z_EXPECTED_ARRAY_OR_STRING_OR_NULL,
+				&args[i]);
 			goto out;
 		}
 	}
@@ -4945,7 +4949,7 @@ PHP_FUNCTION(setlocale)
 		if (Z_TYPE(args[i]) == IS_ARRAY) {
 			zval *elem;
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL(args[i]), elem) {
-				result = try_setlocale_zval(cat, elem, i + 2);
+				result = try_setlocale_zval(cat, elem);
 				if (EG(exception)) {
 					goto out;
 				}
@@ -4956,9 +4960,9 @@ PHP_FUNCTION(setlocale)
 			} ZEND_HASH_FOREACH_END();
 			continue;
 		} else if (Z_ISNULL(args[i])) {
-			result = try_setlocale_str(cat, ZSTR_EMPTY_ALLOC(), i + 2);
+			result = try_setlocale_str(cat, ZSTR_EMPTY_ALLOC());
 		} else {
-			result = try_setlocale_str(cat, strings[i], i + 2);
+			result = try_setlocale_str(cat, strings[i]);
 		}
 		if (EG(exception)) {
 			goto out;