From: Antony Dovgal Date: Wed, 1 Feb 2006 10:31:57 +0000 (+0000) Subject: MFH: fix #36242 (Possible memory corruption in stream_select()) X-Git-Tag: php-5.1.3RC1~179 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b90d985a23a5c3994ba8ad798b077c89f61d2954;p=php MFH: fix #36242 (Possible memory corruption in stream_select()) --- diff --git a/NEWS b/NEWS index 8aac2af185..454321ded6 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,7 @@ PHP NEWS - Added imap_savebody(). (Mike) - Fixed imagecolorallocate() and imagecolorallocatelapha() to return FALSE on error. (Pierre) +- Fixed bug #36242 (Possible memory corruption in stream_select()). (Tony) - Fixed bug #36235 (ocicolumnname returns false before a succesfull fetch). (Tony) - Fixed bug #36224 (date(DATE_ATOM) gives wrong results). (Derick, Hannes diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 51376e3bdc..72153cb392 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -750,7 +750,7 @@ PHP_FUNCTION(stream_select) /* If seconds is not set to null, build the timeval, else we wait indefinitely */ if (sec != NULL) { - convert_to_long_ex(&sec); + convert_to_long(sec); /* Solaris + BSD do not like microsecond values which are >= 1 sec */ if (usec > 999999) {