Merge branch 'PHP-8.3'

devnexen · devnexen · commit 4ffa6e313b63 · 2023-12-22T14:01:05.000Z
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
@@ -269,7 +269,7 @@ static zend_always_inline size_t zend_strnlen(const char* s, size_t maxlen)
 #if defined(HAVE_STRNLEN)
 	return strnlen(s, maxlen);
 #else
-	const char *p = memchr(s, '\0', maxlen);
+	const char *p = (const char *)memchr(s, '\0', maxlen);
 	return p ? p-s : maxlen;
 #endif
 }

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ static zend_always_inline size_t zend_strnlen(const char* s, size_t maxlen)`
`269`	`269`	`#if defined(HAVE_STRNLEN)`
`270`	`270`	`return strnlen(s, maxlen);`
`271`	`271`	`#else`
`272`		`- const char *p = memchr(s, '\0', maxlen);`
	`272`	`+ const char p = (const char )memchr(s, '\0', maxlen);`
`273`	`273`	`return p ? p-s : maxlen;`
`274`	`274`	`#endif`
`275`	`275`	`}`