Use new API for checking if string has NUL bytes

Girgias · jorgsowa · commit 91a5028cff86 · 2024-12-03T17:51:01.000+01:00
diff --git a/ext/session/session.c b/ext/session/session.c
@@ -708,7 +708,7 @@ static bool is_session_name_valid(const zend_string *name, int diagnostic_type)
 		return false;
 	}
 	/* NUL bytes are not allowed */
-	if (ZSTR_LEN(name) != strlen(ZSTR_VAL(name))) {
+	if (zend_str_has_nul_byte(name)) {
 		if (diagnostic_type) {
 			php_error_docref(NULL, diagnostic_type, "session.name \"%s\" cannot contain NUL bytes", ZSTR_VAL(name));
 		}

Original file line number	Diff line number	Diff line change
`@@ -708,7 +708,7 @@ static bool is_session_name_valid(const zend_string *name, int diagnostic_type)`
`708`	`708`	`return false;`
`709`	`709`	`}`
`710`	`710`	`/* NUL bytes are not allowed */`
`711`		`- if (ZSTR_LEN(name) != strlen(ZSTR_VAL(name))) {`
	`711`	`+ if (zend_str_has_nul_byte(name)) {`
`712`	`712`	`if (diagnostic_type) {`
`713`	`713`	`php_error_docref(NULL, diagnostic_type, "session.name \"%s\" cannot contain NUL bytes", ZSTR_VAL(name));`
`714`	`714`	`}`