Use new API for checking if string has NUL bytes

Girgias · Girgias · commit 7ab79e4668d0 · 2022-08-22T16:16:08.000+01:00
diff --git a/ext/session/session.c b/ext/session/session.c
@@ -652,7 +652,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
`@@ -652,7 +652,7 @@ static bool is_session_name_valid(const zend_string *name, int diagnostic_type)`
`652`	`652`	`return false;`
`653`	`653`	`}`
`654`	`654`	`/* NUL bytes are not allowed */`
`655`		`- if (ZSTR_LEN(name) != strlen(ZSTR_VAL(name))) {`
	`655`	`+ if (zend_str_has_nul_byte(name)) {`
`656`	`656`	`if (diagnostic_type) {`
`657`	`657`	`php_error_docref(NULL, diagnostic_type, "session.name \"%s\" cannot contain NUL bytes", ZSTR_VAL(name));`
`658`	`658`	`}`