Skip to content

Commit 7b40a5a

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Fix incompatible function pointer types
2 parents ad470a9 + b43378d commit 7b40a5a

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

NEWS

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ PHP NEWS
1212
calls destructor). (Girgias)
1313
. Fixed bug GH-14510 (memleak due to missing pthread_attr_destroy()-call).
1414
(Florian Engelhardt)
15+
. Fixed bug GH-14549 (Incompatible function pointer type for fclose).
16+
(Ryan Carsten Schmidt)
1517

1618
- BCMatch:
1719
. Fixed bug (bcpowmod() with mod = -1 returns 1 when it must be 0). (Girgias)
@@ -70,7 +72,7 @@ PHP NEWS
7072
. Fixed buffer limit on Windows, replacing read call usage by _read.
7173
(David Carlier)
7274
. Fixed bug GHSA-3qgc-jrrr-25jv (Bypass of CVE-2012-1823, Argument Injection
73-
in PHP-CGI). (CVE-2024-4577) (nielsdos)
75+
in PHP-CGI). (CVE-2024-4577) (nielsdos)
7476

7577
- CLI:
7678
. Fixed bug GH-14189 (PHP Interactive shell input state incorrectly handles
@@ -125,7 +127,7 @@ PHP NEWS
125127

126128
- Standard:
127129
. Fixed bug GHSA-9fcc-425m-g385 (Bypass of CVE-2024-1874).
128-
(CVE-2024-5585) (nielsdos)
130+
(CVE-2024-5585) (nielsdos)
129131

130132
- XML:
131133
. Fixed bug GH-14124 (Segmentation fault with XML extension under certain

build/php.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@ dnl See if we have broken header files like SunOS has.
13031303
dnl
13041304
AC_DEFUN([PHP_MISSING_FCLOSE_DECL],[
13051305
AC_MSG_CHECKING([for fclose declaration])
1306-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[int (*func)(void) = fclose]])],[
1306+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[int (*func)(FILE *) = fclose]])],[
13071307
AC_DEFINE(MISSING_FCLOSE_DECL,0,[ ])
13081308
AC_MSG_RESULT([ok])
13091309
],[

0 commit comments

Comments
 (0)