]> granicus.if.org Git - php/commitdiff
MFH: fix #36242 (Possible memory corruption in stream_select())
authorAntony Dovgal <tony2001@php.net>
Wed, 1 Feb 2006 10:31:57 +0000 (10:31 +0000)
committerAntony Dovgal <tony2001@php.net>
Wed, 1 Feb 2006 10:31:57 +0000 (10:31 +0000)
NEWS
ext/standard/streamsfuncs.c

diff --git a/NEWS b/NEWS
index 8aac2af1854eaa1568f068eeef6e6c6ef7e8586c..454321ded6b019276b9e889fa5c350630f4dbe1f 100644 (file)
--- 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
index 51376e3bdc6c6eec25acc9f9565f5207edd2b1c9..72153cb3925b476e044951c122a17e541fc4310b 100644 (file)
@@ -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) {