tony2001 Wed Feb 1 10:31:57 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/standard streamsfuncs.c
Log:
MFH: fix #36242 (Possible memory corruption in stream_select())
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.388&r2=1.2027.2.389&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.388 php-src/NEWS:1.2027.2.389
--- php-src/NEWS:1.2027.2.388 Tue Jan 31 18:44:18 2006
+++ php-src/NEWS Wed Feb 1 10:31:57 2006
@@ -18,6 +18,7 @@
- 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
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.1&r2=1.58.2.2&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.1
php-src/ext/standard/streamsfuncs.c:1.58.2.2
--- php-src/ext/standard/streamsfuncs.c:1.58.2.1 Sun Jan 1 12:50:15 2006
+++ php-src/ext/standard/streamsfuncs.c Wed Feb 1 10:31:57 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.1 2006/01/01 12:50:15 sniper Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.2 2006/02/01 10:31:57 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -750,7 +750,7 @@
/* 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) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
