tony2001 Wed Feb 1 10:32:38 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src NEWS
/php-src/ext/standard file.c
Log:
MFH: fix #36242 (Possible memory corruption in stream_select())
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.1247.2.920.2.114&r2=1.1247.2.920.2.115&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.114 php-src/NEWS:1.1247.2.920.2.115
--- php-src/NEWS:1.1247.2.920.2.114 Tue Jan 31 10:57:52 2006
+++ php-src/NEWS Wed Feb 1 10:32:38 2006
@@ -2,6 +2,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2006, Version 4.4.3
- Added a check for special characters in the session name. (Ilia)
+- Fixed bug #36242 (Possible memory corruption in stream_select()). (Tony)
- Fixed bug #36223 (curl bypasses open_basedir restrictions). (Tony)
- Fixed bug #36148 (unpack("H*hex", $data) is adding an extra character to the
end of the string). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.279.2.70.2.3&r2=1.279.2.70.2.4&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.279.2.70.2.3
php-src/ext/standard/file.c:1.279.2.70.2.4
--- php-src/ext/standard/file.c:1.279.2.70.2.3 Sun Jan 1 13:46:57 2006
+++ php-src/ext/standard/file.c Wed Feb 1 10:32:38 2006
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.279.2.70.2.3 2006/01/01 13:46:57 sniper Exp $ */
+/* $Id: file.c,v 1.279.2.70.2.4 2006/02/01 10:32:38 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -819,7 +819,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);
if (usec > 999999) {
tv.tv_sec = Z_LVAL_P(sec) + (usec / 1000000);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
