cvs: php-src /ext/standard streamsfuncs.c
| From: | Antony Dovgal | Date: | Wed, 01 Feb 2006 10:31:26 +0000 |
| Subject: | cvs: php-src /ext/standard streamsfuncs.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-36710@lists.php.net to get a copy of this message | ||
tony2001 Wed Feb 1 10:31:26 2006 UTC
Modified files:
/php-src/ext/standard streamsfuncs.c
Log:
fix #36242 (Possible memory corruption in stream_select())
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.60&r2=1.61&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.60 php-src/ext/standard/streamsfuncs.c:1.61
--- php-src/ext/standard/streamsfuncs.c:1.60 Sun Jan 1 13:09:55 2006
+++ php-src/ext/standard/streamsfuncs.c Wed Feb 1 10:31:26 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.60 2006/01/01 13:09:55 sniper Exp $ */
+/* $Id: streamsfuncs.c,v 1.61 2006/02/01 10:31:26 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -761,7 +761,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) {