iliaa Tue Aug 8 14:57:04 2006 UTC
Added files: (Branch: PHP_4_4)
/php-src/ext/session/tests bug38377.phpt
Modified files:
/php-src/ext/session mod_files.c
/php-src NEWS
Log:
MFH: Fixed bug #38377 (session_destroy() gives warning after
session_regenerate_id()).
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_files.c?r1=1.83.2.9.2.3&r2=1.83.2.9.2.4&diff_format=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.83.2.9.2.3
php-src/ext/session/mod_files.c:1.83.2.9.2.4
--- php-src/ext/session/mod_files.c:1.83.2.9.2.3 Mon Apr 17 23:29:37 2006
+++ php-src/ext/session/mod_files.c Tue Aug 8 14:57:04 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mod_files.c,v 1.83.2.9.2.3 2006/04/17 23:29:37 iliaa Exp $ */
+/* $Id: mod_files.c,v 1.83.2.9.2.4 2006/08/08 14:57:04 iliaa Exp $ */
#include "php.h"
@@ -368,7 +368,12 @@
ps_files_close(data);
if (VCWD_UNLINK(buf) == -1) {
- return FAILURE;
+ /* This is a little safety check for instances when we
are dealing with a regenerated session
+ * that was not yet written to disk
+ */
+ if (!VCWD_ACCESS(buf, F_OK)) {
+ return FAILURE;
+ }
}
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.149&r2=1.1247.2.920.2.150&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.149 php-src/NEWS:1.1247.2.920.2.150
--- php-src/NEWS:1.1247.2.920.2.149 Fri Aug 4 20:32:44 2006
+++ php-src/NEWS Tue Aug 8 14:57:04 2006
@@ -1,6 +1,8 @@
PHP 4 NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2006, Version 4.4.4
+- Fixed bug #38377 (session_destroy() gives warning after
+ session_regenerate_id()). (Ilia)
- Fixed bug #38322 (reading past array in sscanf() leads to arbitary code
execution). (Tony)
- Fixed bug #38278 (session_cache_expire()'s value does not match phpinfo's
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/bug38377.phpt?view=markup&rev=1.1
Index: php-src/ext/session/tests/bug38377.phpt
+++ php-src/ext/session/tests/bug38377.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
