Skip to content

Commit c16fd13

Browse files
GirgiasGirgias
committed
tree: use zend_str_has_nul_byte() API
1 parent e43074a commit c16fd13

File tree

11 files changed

+23
-41
lines changed

11 files changed

+23
-41
lines changed

‎Zend/zend_API.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2326,7 +2326,7 @@ static zend_always_inline bool zend_parse_arg_string(zval *arg, char **dest, siz
23262326
static zend_always_inline bool zend_parse_arg_path_str(zval *arg, zend_string **dest, bool check_null, uint32_t arg_num)
23272327
{
23282328
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)))) {
23302330
return 0;
23312331
}
23322332
return 1;

‎Zend/zend_execute.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5211,7 +5211,7 @@ static zend_never_inline zend_op_array* ZEND_FASTCALL zend_include_or_eval(zval
52115211
}
52125212
} else if (UNEXPECTED(EG(exception))) {
52135213
break;
5214-
} else if (UNEXPECTED(strlen(ZSTR_VAL(inc_filename)) != ZSTR_LEN(inc_filename))) {
5214+
} else if (UNEXPECTED(zend_str_has_nul_byte(inc_filename))) {
52155215
zend_message_dispatcher(
52165216
(type == ZEND_INCLUDE_ONCE) ?
52175217
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
52455245
break;
52465246
case ZEND_INCLUDE:
52475247
case ZEND_REQUIRE:
5248-
if (UNEXPECTED(strlen(ZSTR_VAL(inc_filename)) != ZSTR_LEN(inc_filename))) {
5248+
if (UNEXPECTED(zend_str_has_nul_byte(inc_filename))) {
52495249
zend_message_dispatcher(
52505250
(type == ZEND_INCLUDE) ?
52515251
ZMSG_FAILED_INCLUDE_FOPEN : ZMSG_FAILED_REQUIRE_FOPEN,

‎ext/dom/document.c‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1831,7 +1831,7 @@ static void dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
18311831
char resolved_path[MAXPATHLEN + 1];
18321832

18331833
id = ZEND_THIS;
1834-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &source, &source_len, &flags) == FAILURE) {
1834+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|l", &source, &source_len, &flags) == FAILURE) {
18351835
RETURN_THROWS();
18361836
}
18371837

@@ -1846,11 +1846,6 @@ static void dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
18461846

18471847
switch (type) {
18481848
case DOM_LOAD_FILE:
1849-
if (CHECK_NULL_PATH(source, source_len)) {
1850-
PHP_LIBXML_RESTORE_GLOBALS(new_parser_ctxt);
1851-
zend_argument_value_error(1, "must not contain any null bytes");
1852-
RETURN_THROWS();
1853-
}
18541849
valid_file = dom_get_valid_file_path(source, resolved_path, MAXPATHLEN);
18551850
if (!valid_file) {
18561851
PHP_LIBXML_RESTORE_GLOBALS(new_parser_ctxt);
@@ -1940,7 +1935,7 @@ static void dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type
19401935
char resolved_path[MAXPATHLEN + 1];
19411936

19421937
id = ZEND_THIS;
1943-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &source, &source_len) == FAILURE) {
1938+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &source, &source_len) == FAILURE) {
19441939
RETURN_THROWS();
19451940
}
19461941

@@ -1953,10 +1948,6 @@ static void dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type
19531948

19541949
switch (type) {
19551950
case DOM_LOAD_FILE:
1956-
if (CHECK_NULL_PATH(source, source_len)) {
1957-
zend_argument_value_error(1, "must not contain any null bytes");
1958-
RETURN_THROWS();
1959-
}
19601951
valid_file = dom_get_valid_file_path(source, resolved_path, MAXPATHLEN);
19611952
if (!valid_file) {
19621953
php_error_docref(NULL, E_WARNING, "Invalid RelaxNG file source");
@@ -2033,7 +2024,7 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
20332024
zend_long options = 0;
20342025
htmlParserCtxtPtr ctxt;
20352026

2036-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &source, &source_len, &options) == FAILURE) {
2027+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|l", &source, &source_len, &options) == FAILURE) {
20372028
RETURN_THROWS();
20382029
}
20392030

@@ -2048,10 +2039,6 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
20482039
}
20492040

20502041
if (mode == DOM_LOAD_FILE) {
2051-
if (CHECK_NULL_PATH(source, source_len)) {
2052-
zend_argument_value_error(1, "must not contain any null bytes");
2053-
RETURN_THROWS();
2054-
}
20552042
ctxt = htmlCreateFileParserCtxt(source, NULL);
20562043
} else {
20572044
if (ZEND_SIZE_T_INT_OVFL(source_len)) {

‎ext/mbstring/mbstring.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4506,7 +4506,7 @@ PHP_FUNCTION(mb_send_mail)
45064506
ZEND_PARSE_PARAMETERS_END();
45074507

45084508
if (str_headers) {
4509-
if (strlen(ZSTR_VAL(str_headers)) != ZSTR_LEN(str_headers)) {
4509+
if (UNEXPECTED(zend_str_has_nul_byte(str_headers))) {
45104510
zend_argument_value_error(4, "must not contain any null bytes");
45114511
RETURN_THROWS();
45124512
}

‎ext/odbc/php_odbc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1063,7 +1063,7 @@ PHP_FUNCTION(odbc_execute)
10631063
ZSTR_VAL(tmpstr)[0] == '\'' &&
10641064
ZSTR_VAL(tmpstr)[ZSTR_LEN(tmpstr) - 1] == '\'') {
10651065

1066-
if (ZSTR_LEN(tmpstr) != strlen(ZSTR_VAL(tmpstr))) {
1066+
if (UNEXPECTED(zend_str_has_nul_byte(tmpstr))) {
10671067
odbc_release_params(result, params);
10681068
RETURN_FALSE;
10691069
}

‎ext/standard/exec.c‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -199,31 +199,26 @@ PHPAPI int php_exec(int type, const char *cmd, zval *array, zval *return_value)
199199

200200
static void php_exec_ex(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
201201
{
202-
char *cmd;
203-
size_t cmd_len;
202+
zend_string *cmd;
204203
zval *ret_code=NULL, *ret_array=NULL;
205204
int ret;
206205

207206
ZEND_PARSE_PARAMETERS_START(1, (mode ? 2 : 3))
208-
Z_PARAM_STRING(cmd, cmd_len)
207+
Z_PARAM_PATH_STR(cmd)
209208
Z_PARAM_OPTIONAL
210209
if (!mode) {
211210
Z_PARAM_ZVAL(ret_array)
212211
}
213212
Z_PARAM_ZVAL(ret_code)
214213
ZEND_PARSE_PARAMETERS_END();
215214

216-
if (!cmd_len) {
215+
if (UNEXPECTED(!ZSTR_LEN(cmd))) {
217216
zend_argument_must_not_be_empty_error(1);
218217
RETURN_THROWS();
219218
}
220-
if (strlen(cmd) != cmd_len) {
221-
zend_argument_value_error(1, "must not contain any null bytes");
222-
RETURN_THROWS();
223-
}
224219

225220
if (!ret_array) {
226-
ret = php_exec(mode, cmd, NULL, return_value);
221+
ret = php_exec(mode, ZSTR_VAL(cmd), NULL, return_value);
227222
} else {
228223
if (Z_TYPE_P(Z_REFVAL_P(ret_array)) == IS_ARRAY) {
229224
ZVAL_DEREF(ret_array);
@@ -235,7 +230,7 @@ static void php_exec_ex(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
235230
}
236231
}
237232

238-
ret = php_exec(2, cmd, ret_array, return_value);
233+
ret = php_exec(2, ZSTR_VAL(cmd), ret_array, return_value);
239234
}
240235
if (ret_code) {
241236
ZEND_TRY_ASSIGN_REF_LONG(ret_code, ret);
@@ -280,7 +275,7 @@ PHPAPI zend_string *php_escape_shell_cmd(const zend_string *unescaped_cmd)
280275
char *p = NULL;
281276
#endif
282277

283-
ZEND_ASSERT(ZSTR_LEN(unescaped_cmd) == strlen(ZSTR_VAL(unescaped_cmd)) && "Must be a binary safe string");
278+
ZEND_ASSERT(!zend_str_has_nul_byte(unescaped_cmd) && "Must be a binary safe string");
284279
size_t l = ZSTR_LEN(unescaped_cmd);
285280
const char *str = ZSTR_VAL(unescaped_cmd);
286281

@@ -387,7 +382,7 @@ PHPAPI zend_string *php_escape_shell_arg(const zend_string *unescaped_arg)
387382
size_t x, y = 0;
388383
zend_string *cmd;
389384

390-
ZEND_ASSERT(ZSTR_LEN(unescaped_arg) == strlen(ZSTR_VAL(unescaped_arg)) && "Must be a binary safe string");
385+
ZEND_ASSERT(!zend_str_has_nul_byte(unescaped_arg) && "Must be a binary safe string");
391386
size_t l = ZSTR_LEN(unescaped_arg);
392387
const char *str = ZSTR_VAL(unescaped_arg);
393388

‎ext/standard/filestat.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ PHPAPI void php_stat(zend_string *filename, int type, zval *return_value)
749749
php_stream_wrapper *wrapper = NULL;
750750

751751
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)) {
753753
if (ZSTR_LEN(filename) && !IS_EXISTS_CHECK(type)) {
754754
php_error_docref(NULL, E_WARNING, "Filename contains null byte");
755755
}
@@ -821,7 +821,7 @@ PHPAPI void php_stat(zend_string *filename, int type, zval *return_value)
821821
}
822822

823823
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)) {
825825
if (ZSTR_LEN(filename) && !IS_EXISTS_CHECK(type)) {
826826
php_error_docref(NULL, E_WARNING, "Filename contains null byte");
827827
}

‎ext/standard/image.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1618,7 +1618,7 @@ static void php_getimagesize_from_any(INTERNAL_FUNCTION_PARAMETERS, int mode) {
16181618
Z_PARAM_ZVAL(info)
16191619
ZEND_PARSE_PARAMETERS_END();
16201620

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)) {
16221622
zend_argument_value_error(1, "must not contain any null bytes");
16231623
RETURN_THROWS();
16241624
}

‎ext/standard/mail.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ PHP_FUNCTION(mail)
290290
ZEND_PARSE_PARAMETERS_END();
291291

292292
if (headers_str) {
293-
if (strlen(ZSTR_VAL(headers_str)) != ZSTR_LEN(headers_str)) {
293+
if (UNEXPECTED(zend_str_has_nul_byte(headers_str))) {
294294
zend_argument_value_error(4, "must not contain any null bytes");
295295
RETURN_THROWS();
296296
}

‎ext/xsl/xsltprocessor.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ PHP_METHOD(XSLTProcessor, setParameter)
609609
RETURN_THROWS();
610610
}
611611

612-
if (UNEXPECTED(CHECK_NULL_PATH(ZSTR_VAL(string_key), ZSTR_LEN(string_key)))) {
612+
if (UNEXPECTED(zend_str_has_nul_byte(string_key))) {
613613
zend_argument_value_error(3, "must not contain keys with any null bytes");
614614
RETURN_THROWS();
615615
}
@@ -625,7 +625,7 @@ PHP_METHOD(XSLTProcessor, setParameter)
625625
RETURN_THROWS();
626626
}
627627

628-
if (UNEXPECTED(CHECK_NULL_PATH(ZSTR_VAL(str), ZSTR_LEN(str)))) {
628+
if (UNEXPECTED(zend_str_has_nul_byte(str))) {
629629
zend_string_release(str);
630630
zend_string_release_ex(ht_key, false);
631631
zend_argument_value_error(3, "must not contain values with any null bytes");
@@ -643,7 +643,7 @@ PHP_METHOD(XSLTProcessor, setParameter)
643643
RETURN_THROWS();
644644
}
645645

646-
if (UNEXPECTED(CHECK_NULL_PATH(ZSTR_VAL(name), ZSTR_LEN(name)))) {
646+
if (UNEXPECTED(zend_str_has_nul_byte(name))) {
647647
zend_argument_value_error(2, "must not contain any null bytes");
648648
RETURN_THROWS();
649649
}

0 commit comments

Comments
 (0)