cvs: php-src /ext/session session.c
| From: | Antony Dovgal | Date: | Wed, 02 Aug 2006 09:15:13 +0000 |
| Subject: | cvs: php-src /ext/session session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-39717@lists.php.net to get a copy of this message | ||
tony2001 Wed Aug 2 09:15:13 2006 UTC
Modified files:
/php-src/ext/session session.c
Log:
fix #38289 (segfault in session_decode() when _SESSION is NULL)
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.444&r2=1.445&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.444 php-src/ext/session/session.c:1.445
--- php-src/ext/session/session.c:1.444 Tue Aug 1 08:31:37 2006
+++ php-src/ext/session/session.c Wed Aug 2 09:15:13 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.444 2006/08/01 08:31:37 tony2001 Exp $ */
+/* $Id: session.c,v 1.445 2006/08/02 09:15:13 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -279,8 +279,13 @@
{
zval **sym_track = NULL;
- zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), name, namelen + 1,
- (void *) &sym_track);
+ IF_SESSION_VARS() {
+ zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), name, namelen + 1,
+ (void *) &sym_track);
+ } else {
+ return;
+ }
+
if (sym_track == NULL) {
zval *empty_var;