1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  Fix potential OOB when checking for trailing spaces
This commit is contained in:
Christoph M. Becker
2025-01-16 00:02:23 +01:00
2 changed files with 2 additions and 1 deletions

1
NEWS
View File

@@ -15,6 +15,7 @@ PHP NEWS
inherited final). (ilutov)
. Fixed NULL arithmetic during system program execution on Windows. (cmb,
nielsdos)
. Fixed potential OOB when checking for trailing spaces on Windows. (cmb)
- DOM:
. Fixed bug GH-17397 (Assertion failure ext/dom/php_dom.c). (nielsdos)

View File

@@ -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) {