tree: use zend_str_has_nul_byte() API (#19336)

Girgias · web-flow · commit 105c1e989607 · 2025-07-31T23:57:27.000+01:00
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
@@ -2326,7 +2326,7 @@ static zend_always_inline bool zend_parse_arg_string(zval *arg, char **dest, siz
 static zend_always_inline bool zend_parse_arg_path_str(zval *arg, zend_string **dest, bool check_null, uint32_t arg_num)
 {
 	if (!zend_parse_arg_str(arg, dest, check_null, arg_num) ||
-	    (*dest && UNEXPECTED(CHECK_NULL_PATH(ZSTR_VAL(*dest), ZSTR_LEN(*dest))))) {
+	    (*dest && UNEXPECTED(zend_str_has_nul_byte(*dest)))) {
 		return 0;
 	}
 	return 1;
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -5211,7 +5211,7 @@ static zend_never_inline zend_op_array* ZEND_FASTCALL zend_include_or_eval(zval
 					}
 				} else if (UNEXPECTED(EG(exception))) {
 					break;
-				} else if (UNEXPECTED(strlen(ZSTR_VAL(inc_filename)) != ZSTR_LEN(inc_filename))) {
+				} else if (UNEXPECTED(zend_str_has_nul_byte(inc_filename))) {
 					zend_message_dispatcher(
 						(type == ZEND_INCLUDE_ONCE) ?
 							ZMSG_FAILED_INCLUDE_FOPEN : ZMSG_FAILED_REQUIRE_FOPEN,
@@ -5245,7 +5245,7 @@ static zend_never_inline zend_op_array* ZEND_FASTCALL zend_include_or_eval(zval
 			break;
 		case ZEND_INCLUDE:
 		case ZEND_REQUIRE:
-			if (UNEXPECTED(strlen(ZSTR_VAL(inc_filename)) != ZSTR_LEN(inc_filename))) {
+			if (UNEXPECTED(zend_str_has_nul_byte(inc_filename))) {
 				zend_message_dispatcher(
 					(type == ZEND_INCLUDE) ?
 						ZMSG_FAILED_INCLUDE_FOPEN : ZMSG_FAILED_REQUIRE_FOPEN,
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
@@ -4506,7 +4506,7 @@ PHP_FUNCTION(mb_send_mail)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (str_headers) {
-		if (strlen(ZSTR_VAL(str_headers)) != ZSTR_LEN(str_headers)) {
+		if (UNEXPECTED(zend_str_has_nul_byte(str_headers))) {
 			zend_argument_value_error(4, "must not contain any null bytes");
 			RETURN_THROWS();
 		}
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
@@ -1062,7 +1062,7 @@ PHP_FUNCTION(odbc_execute)
 				ZSTR_VAL(tmpstr)[0] == '\'' &&
 				ZSTR_VAL(tmpstr)[ZSTR_LEN(tmpstr) - 1] == '\'') {
 
-				if (ZSTR_LEN(tmpstr) != strlen(ZSTR_VAL(tmpstr))) {
+				if (UNEXPECTED(zend_str_has_nul_byte(tmpstr))) {
 					odbc_release_params(result, params);
 					RETURN_FALSE;
 				}
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
@@ -199,31 +199,26 @@ PHPAPI int php_exec(int type, const char *cmd, zval *array, zval *return_value)
 
 static void php_exec_ex(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
 {
-	char *cmd;
-	size_t cmd_len;
+	zend_string *cmd;
 	zval *ret_code=NULL, *ret_array=NULL;
 	int ret;
 
 	ZEND_PARSE_PARAMETERS_START(1, (mode ? 2 : 3))
-		Z_PARAM_STRING(cmd, cmd_len)
+		Z_PARAM_PATH_STR(cmd)
 		Z_PARAM_OPTIONAL
 		if (!mode) {
 			Z_PARAM_ZVAL(ret_array)
 		}
 		Z_PARAM_ZVAL(ret_code)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (!cmd_len) {
+	if (UNEXPECTED(!ZSTR_LEN(cmd))) {
 		zend_argument_must_not_be_empty_error(1);
 		RETURN_THROWS();
 	}
-	if (strlen(cmd) != cmd_len) {
-		zend_argument_value_error(1, "must not contain any null bytes");
-		RETURN_THROWS();
-	}
 
 	if (!ret_array) {
-		ret = php_exec(mode, cmd, NULL, return_value);
+		ret = php_exec(mode, ZSTR_VAL(cmd), NULL, return_value);
 	} else {
 		if (Z_TYPE_P(Z_REFVAL_P(ret_array)) == IS_ARRAY) {
 			ZVAL_DEREF(ret_array);
@@ -235,7 +230,7 @@ static void php_exec_ex(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
 			}
 		}
 
-		ret = php_exec(2, cmd, ret_array, return_value);
+		ret = php_exec(2, ZSTR_VAL(cmd), ret_array, return_value);
 	}
 	if (ret_code) {
 		ZEND_TRY_ASSIGN_REF_LONG(ret_code, ret);
@@ -280,7 +275,7 @@ PHPAPI zend_string *php_escape_shell_cmd(const zend_string *unescaped_cmd)
 	char *p = NULL;
 #endif
 
-	ZEND_ASSERT(ZSTR_LEN(unescaped_cmd) == strlen(ZSTR_VAL(unescaped_cmd)) && "Must be a binary safe string");
+	ZEND_ASSERT(!zend_str_has_nul_byte(unescaped_cmd) && "Must be a binary safe string");
 	size_t l = ZSTR_LEN(unescaped_cmd);
 	const char *str = ZSTR_VAL(unescaped_cmd);
 
@@ -387,7 +382,7 @@ PHPAPI zend_string *php_escape_shell_arg(const zend_string *unescaped_arg)
 	size_t x, y = 0;
 	zend_string *cmd;
 
-	ZEND_ASSERT(ZSTR_LEN(unescaped_arg) == strlen(ZSTR_VAL(unescaped_arg)) && "Must be a binary safe string");
+	ZEND_ASSERT(!zend_str_has_nul_byte(unescaped_arg) && "Must be a binary safe string");
 	size_t l = ZSTR_LEN(unescaped_arg);
 	const char *str = ZSTR_VAL(unescaped_arg);
 
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
@@ -749,7 +749,7 @@ PHPAPI void php_stat(zend_string *filename, int type, zval *return_value)
 	php_stream_wrapper *wrapper = NULL;
 
 	if (IS_ACCESS_CHECK(type)) {
-		if (!ZSTR_LEN(filename) || CHECK_NULL_PATH(ZSTR_VAL(filename), ZSTR_LEN(filename))) {
+		if (!ZSTR_LEN(filename) || zend_str_has_nul_byte(filename)) {
 			if (ZSTR_LEN(filename) && !IS_EXISTS_CHECK(type)) {
 				php_error_docref(NULL, E_WARNING, "Filename contains null byte");
 			}
@@ -821,7 +821,7 @@ PHPAPI void php_stat(zend_string *filename, int type, zval *return_value)
 		}
 
 		if (!wrapper) {
-			if (!ZSTR_LEN(filename) || CHECK_NULL_PATH(ZSTR_VAL(filename), ZSTR_LEN(filename))) {
+			if (!ZSTR_LEN(filename) || zend_str_has_nul_byte(filename)) {
 				if (ZSTR_LEN(filename) && !IS_EXISTS_CHECK(type)) {
 					php_error_docref(NULL, E_WARNING, "Filename contains null byte");
 				}
diff --git a/ext/standard/image.c b/ext/standard/image.c
@@ -1618,7 +1618,7 @@ static void php_getimagesize_from_any(INTERNAL_FUNCTION_PARAMETERS, int mode) {
 		Z_PARAM_ZVAL(info)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (mode == FROM_PATH && CHECK_NULL_PATH(ZSTR_VAL(input), ZSTR_LEN(input))) {
+	if (mode == FROM_PATH && zend_str_has_nul_byte(input)) {
 		zend_argument_value_error(1, "must not contain any null bytes");
 		RETURN_THROWS();
 	}
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
@@ -290,7 +290,7 @@ PHP_FUNCTION(mail)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (headers_str) {
-		if (strlen(ZSTR_VAL(headers_str)) != ZSTR_LEN(headers_str)) {
+		if (UNEXPECTED(zend_str_has_nul_byte(headers_str))) {
 			zend_argument_value_error(4, "must not contain any null bytes");
 			RETURN_THROWS();
 		}
diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c
@@ -609,7 +609,7 @@ PHP_METHOD(XSLTProcessor, setParameter)
 				RETURN_THROWS();
 			}
 
-			if (UNEXPECTED(CHECK_NULL_PATH(ZSTR_VAL(string_key), ZSTR_LEN(string_key)))) {
+			if (UNEXPECTED(zend_str_has_nul_byte(string_key))) {
 				zend_argument_value_error(3, "must not contain keys with any null bytes");
 				RETURN_THROWS();
 			}
@@ -625,7 +625,7 @@ PHP_METHOD(XSLTProcessor, setParameter)
 				RETURN_THROWS();
 			}
 
-			if (UNEXPECTED(CHECK_NULL_PATH(ZSTR_VAL(str), ZSTR_LEN(str)))) {
+			if (UNEXPECTED(zend_str_has_nul_byte(str))) {
 				zend_string_release(str);
 				zend_string_release_ex(ht_key, false);
 				zend_argument_value_error(3, "must not contain values with any null bytes");
@@ -643,7 +643,7 @@ PHP_METHOD(XSLTProcessor, setParameter)
 			RETURN_THROWS();
 		}
 
-		if (UNEXPECTED(CHECK_NULL_PATH(ZSTR_VAL(name), ZSTR_LEN(name)))) {
+		if (UNEXPECTED(zend_str_has_nul_byte(name))) {
 			zend_argument_value_error(2, "must not contain any null bytes");
 			RETURN_THROWS();
 		}
diff --git a/main/main.c b/main/main.c
@@ -707,7 +707,7 @@ static PHP_INI_MH(OnUpdateMailLog)
 static PHP_INI_MH(OnChangeMailForceExtra)
 {
 	/* Check that INI setting does not have any nul bytes */
-	if (new_value && ZSTR_LEN(new_value) != strlen(ZSTR_VAL(new_value))) {
+	if (new_value && zend_str_has_nul_byte(new_value)) {
 		/* TODO Emit warning? */
 		return FAILURE;
 	}

Original file line number	Diff line number	Diff line change
`@@ -2326,7 +2326,7 @@ static zend_always_inline bool zend_parse_arg_string(zval arg, char *dest, siz`
`2326`	`2326`	`static zend_always_inline bool zend_parse_arg_path_str(zval arg, zend_string *dest, bool check_null, uint32_t arg_num)`
`2327`	`2327`	`{`
`2328`	`2328`	`if (!zend_parse_arg_str(arg, dest, check_null, arg_num) \|\|`
`2329`		`- (dest && UNEXPECTED(CHECK_NULL_PATH(ZSTR_VAL(dest), ZSTR_LEN(*dest))))) {`
	`2329`	`+ (dest && UNEXPECTED(zend_str_has_nul_byte(dest)))) {`
`2330`	`2330`	`return 0;`
`2331`	`2331`	`}`
`2332`	`2332`	`return 1;`
Original file line number	Diff line number	Diff line change
`@@ -4506,7 +4506,7 @@ PHP_FUNCTION(mb_send_mail)`
`4506`	`4506`	`ZEND_PARSE_PARAMETERS_END();`
`4507`	`4507`
`4508`	`4508`	`if (str_headers) {`
`4509`		`- if (strlen(ZSTR_VAL(str_headers)) != ZSTR_LEN(str_headers)) {`
	`4509`	`+ if (UNEXPECTED(zend_str_has_nul_byte(str_headers))) {`
`4510`	`4510`	`zend_argument_value_error(4, "must not contain any null bytes");`
`4511`	`4511`	`RETURN_THROWS();`
`4512`	`4512`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1062,7 +1062,7 @@ PHP_FUNCTION(odbc_execute)`
`1062`	`1062`	`ZSTR_VAL(tmpstr)[0] == '\'' &&`
`1063`	`1063`	`ZSTR_VAL(tmpstr)[ZSTR_LEN(tmpstr) - 1] == '\'') {`
`1064`	`1064`
`1065`		`- if (ZSTR_LEN(tmpstr) != strlen(ZSTR_VAL(tmpstr))) {`
	`1065`	`+ if (UNEXPECTED(zend_str_has_nul_byte(tmpstr))) {`
`1066`	`1066`	`odbc_release_params(result, params);`
`1067`	`1067`	`RETURN_FALSE;`
`1068`	`1068`	`}`
Original file line number	Diff line number	Diff line change
`@@ -749,7 +749,7 @@ PHPAPI void php_stat(zend_string filename, int type, zval return_value)`
`749`	`749`	`php_stream_wrapper *wrapper = NULL;`
`750`	`750`
`751`	`751`	`if (IS_ACCESS_CHECK(type)) {`
`752`		`- if (!ZSTR_LEN(filename) \|\| CHECK_NULL_PATH(ZSTR_VAL(filename), ZSTR_LEN(filename))) {`
	`752`	`+ if (!ZSTR_LEN(filename) \|\| zend_str_has_nul_byte(filename)) {`
`753`	`753`	`if (ZSTR_LEN(filename) && !IS_EXISTS_CHECK(type)) {`
`754`	`754`	`php_error_docref(NULL, E_WARNING, "Filename contains null byte");`
`755`	`755`	`}`
`@@ -821,7 +821,7 @@ PHPAPI void php_stat(zend_string filename, int type, zval return_value)`
`821`	`821`	`}`
`822`	`822`
`823`	`823`	`if (!wrapper) {`
`824`		`- if (!ZSTR_LEN(filename) \|\| CHECK_NULL_PATH(ZSTR_VAL(filename), ZSTR_LEN(filename))) {`
	`824`	`+ if (!ZSTR_LEN(filename) \|\| zend_str_has_nul_byte(filename)) {`
`825`	`825`	`if (ZSTR_LEN(filename) && !IS_EXISTS_CHECK(type)) {`
`826`	`826`	`php_error_docref(NULL, E_WARNING, "Filename contains null byte");`
`827`	`827`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1618,7 +1618,7 @@ static void php_getimagesize_from_any(INTERNAL_FUNCTION_PARAMETERS, int mode) {`
`1618`	`1618`	`Z_PARAM_ZVAL(info)`
`1619`	`1619`	`ZEND_PARSE_PARAMETERS_END();`
`1620`	`1620`
`1621`		`- if (mode == FROM_PATH && CHECK_NULL_PATH(ZSTR_VAL(input), ZSTR_LEN(input))) {`
	`1621`	`+ if (mode == FROM_PATH && zend_str_has_nul_byte(input)) {`
`1622`	`1622`	`zend_argument_value_error(1, "must not contain any null bytes");`
`1623`	`1623`	`RETURN_THROWS();`
`1624`	`1624`	`}`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ PHP_FUNCTION(mail)`
`290`	`290`	`ZEND_PARSE_PARAMETERS_END();`
`291`	`291`
`292`	`292`	`if (headers_str) {`
`293`		`- if (strlen(ZSTR_VAL(headers_str)) != ZSTR_LEN(headers_str)) {`
	`293`	`+ if (UNEXPECTED(zend_str_has_nul_byte(headers_str))) {`
`294`	`294`	`zend_argument_value_error(4, "must not contain any null bytes");`
`295`	`295`	`RETURN_THROWS();`
`296`	`296`	`}`
Original file line number	Diff line number	Diff line change
`@@ -609,7 +609,7 @@ PHP_METHOD(XSLTProcessor, setParameter)`
`609`	`609`	`RETURN_THROWS();`
`610`	`610`	`}`
`611`	`611`
`612`		`- if (UNEXPECTED(CHECK_NULL_PATH(ZSTR_VAL(string_key), ZSTR_LEN(string_key)))) {`
	`612`	`+ if (UNEXPECTED(zend_str_has_nul_byte(string_key))) {`
`613`	`613`	`zend_argument_value_error(3, "must not contain keys with any null bytes");`
`614`	`614`	`RETURN_THROWS();`
`615`	`615`	`}`
`@@ -625,7 +625,7 @@ PHP_METHOD(XSLTProcessor, setParameter)`
`625`	`625`	`RETURN_THROWS();`
`626`	`626`	`}`
`627`	`627`
`628`		`- if (UNEXPECTED(CHECK_NULL_PATH(ZSTR_VAL(str), ZSTR_LEN(str)))) {`
	`628`	`+ if (UNEXPECTED(zend_str_has_nul_byte(str))) {`
`629`	`629`	`zend_string_release(str);`
`630`	`630`	`zend_string_release_ex(ht_key, false);`
`631`	`631`	`zend_argument_value_error(3, "must not contain values with any null bytes");`
`@@ -643,7 +643,7 @@ PHP_METHOD(XSLTProcessor, setParameter)`
`643`	`643`	`RETURN_THROWS();`
`644`	`644`	`}`
`645`	`645`
`646`		`- if (UNEXPECTED(CHECK_NULL_PATH(ZSTR_VAL(name), ZSTR_LEN(name)))) {`
	`646`	`+ if (UNEXPECTED(zend_str_has_nul_byte(name))) {`
`647`	`647`	`zend_argument_value_error(2, "must not contain any null bytes");`
`648`	`648`	`RETURN_THROWS();`
`649`	`649`	`}`
Original file line number	Diff line number	Diff line change
`@@ -707,7 +707,7 @@ static PHP_INI_MH(OnUpdateMailLog)`
`707`	`707`	`static PHP_INI_MH(OnChangeMailForceExtra)`
`708`	`708`	`{`
`709`	`709`	`/* Check that INI setting does not have any nul bytes */`
`710`		`- if (new_value && ZSTR_LEN(new_value) != strlen(ZSTR_VAL(new_value))) {`
	`710`	`+ if (new_value && zend_str_has_nul_byte(new_value)) {`
`711`	`711`	`/* TODO Emit warning? */`
`712`	`712`	`return FAILURE;`
`713`	`713`	`}`