Merge branch 'PHP-8.4'

* PHP-8.4: Fix potential OOB when checking for trailing spaces
php · Jan 15, 2025 · 39f1d25 · 39f1d25
2 parents 8d6f46d + b702eaf
commit 39f1d25
Showing 1 changed file with 1 addition and 1 deletion.
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) {