cvs: php-src(PHP_5_0) /ext/session session.c
| From: | Ilia Alshanetsky | Date: | Thu, 02 Sep 2004 02:44:12 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/session session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-28539@lists.php.net to get a copy of this message | ||
iliaa Wed Sep 1 22:44:12 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/session session.c
Log:
MFH: Fixed bug #29925 (Added a check to prevent illegal characters in
session key).
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.391&r2=1.391.2.1&ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.391 php-src/ext/session/session.c:1.391.2.1
--- php-src/ext/session/session.c:1.391 Sat Jul 10 03:46:08 2004
+++ php-src/ext/session/session.c Wed Sep 1 22:44:12 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.391 2004/07/10 07:46:08 andi Exp $ */
+/* $Id: session.c,v 1.391.2.1 2004/09/02 02:44:12 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -451,6 +451,11 @@
PS_ENCODE_LOOP(
smart_str_appendl(&buf, key, (unsigned char) key_length);
+ if (memchr(key, PS_DELIMITER, key_length)) {
+ PHP_VAR_SERIALIZE_DESTROY(var_hash);
+ smart_str_free(&buf);
+ return FAILURE;
+ }
smart_str_appendc(&buf, PS_DELIMITER);
php_var_serialize(&buf, struc, &var_hash TSRMLS_CC);