Skip to content

Commit b90d985

Browse files
committed
MFH: fix #36242 (Possible memory corruption in stream_select())
1 parent 823b39b commit b90d985

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

NEWS

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ PHP NEWS
1818
- Added imap_savebody(). (Mike)
1919
- Fixed imagecolorallocate() and imagecolorallocatelapha() to return FALSE
2020
on error. (Pierre)
21+
- Fixed bug #36242 (Possible memory corruption in stream_select()). (Tony)
2122
- Fixed bug #36235 (ocicolumnname returns false before a succesfull fetch).
2223
(Tony)
2324
- Fixed bug #36224 (date(DATE_ATOM) gives wrong results). (Derick, Hannes

ext/standard/streamsfuncs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ PHP_FUNCTION(stream_select)
750750

751751
/* If seconds is not set to null, build the timeval, else we wait indefinitely */
752752
if (sec != NULL) {
753-
convert_to_long_ex(&sec);
753+
convert_to_long(sec);
754754

755755
/* Solaris + BSD do not like microsecond values which are >= 1 sec */
756756
if (usec > 999999) {

0 commit comments

Comments
 (0)