Skip to content

Commit 8e20a67

Browse files
nielsdoscharmitro
authored andcommitted
Fix phpGH-17225: NULL deref in spl_directory.c
NULL checks for the glob stream are inconsistently applied. To solve this generally, factor it out to a helper function so it's less likely to be forgotten in the future. Closes phpGH-17231.
1 parent f8cd53f commit 8e20a67

File tree

3 files changed

+223
-138
lines changed

3 files changed

+223
-138
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ PHP NEWS
7272
on SO_SNDTIMEO/SO_RCVTIMEO for socket_set_option().
7373
(David Carlier)
7474

75+
- SPL:
76+
. Fixed bug GH-17225 (NULL deref in spl_directory.c). (nielsdos)
77+
7578
- Streams:
7679
. Fixed bug GH-17037 (UAF in user filter when adding existing filter name due
7780
to incorrect error handling). (nielsdos)

0 commit comments

Comments
 (0)