Skip to content

tree: use zend_str_has_nul_byte() API #19336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 31, 2025
Merged

tree: use zend_str_has_nul_byte() API #19336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Zend/zend_API.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Zend/zend_execute.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ext/mbstring/mbstring.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion ext/odbc/php_odbc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,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;
}
Expand Down
19 changes: 7 additions & 12 deletions ext/standard/exec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions ext/standard/filestat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down Expand Up @@ -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");
}
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/image.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/mail.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
6 changes: 3 additions & 3 deletions ext/xsl/xsltprocessor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand All @@ -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");
Expand All @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion main/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down