Merge branch 'PHP-8.4'

cmb69 · cmb69 · commit 39f1d253b138 · 2025-01-16T00:03:16.000+01:00
* PHP-8.4:
  Fix potential OOB when checking for trailing spaces
diff --git a/win32/winutil.c b/win32/winutil.c
@@ -56,7 +56,7 @@ PHP_WINUTIL_API void php_win32_error_msg_free(char *msg)
 
 int php_win32_check_trailing_space(const char * path, const size_t path_len)
 {/*{{{*/
-	if (path_len > MAXPATHLEN - 1) {
+	if (path_len == 0 || path_len > MAXPATHLEN - 1) {
 		return 1;
 	}
 	if (path) {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ PHP_WINUTIL_API void php_win32_error_msg_free(char *msg)`
`56`	`56`
`57`	`57`	`int php_win32_check_trailing_space(const char * path, const size_t path_len)`
`58`	`58`	`{/{{{/`
`59`		`- if (path_len > MAXPATHLEN - 1) {`
	`59`	`+ if (path_len == 0 \|\| path_len > MAXPATHLEN - 1) {`
`60`	`60`	`return 1;`
`61`	`61`	`}`
`62`	`62`	`if (path) {`