|
Line 0
Link Here
|
|
|
1 |
Index: ext/session/session.c |
| 2 |
--- session.c 2007/01/09 15:31:36 1.336.2.53.2.13 |
| 3 |
+++ session.c 2007/02/15 09:41:30 1.336.2.53.2.14 |
| 4 |
@@ -17,7 +17,7 @@ |
| 5 |
+----------------------------------------------------------------------+ |
| 6 |
*/ |
| 7 |
|
| 8 |
-/* $Id: session.c,v 1.336.2.53.2.13 2007/01/09 15:31:36 iliaa Exp $ */ |
| 9 |
+/* $Id: session.c,v 1.336.2.53.2.14 2007/02/15 09:41:30 tony2001 Exp $ */ |
| 10 |
|
| 11 |
#ifdef HAVE_CONFIG_H |
| 12 |
#include "config.h" |
| 13 |
@@ -271,8 +271,12 @@ |
| 14 |
{ |
| 15 |
zval **sym_track = NULL; |
| 16 |
|
| 17 |
- zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), name, namelen + 1, |
| 18 |
- (void *) &sym_track); |
| 19 |
+ IF_SESSION_VARS() { |
| 20 |
+ zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), name, namelen + 1, |
| 21 |
+ (void *) &sym_track); |
| 22 |
+ } else { |
| 23 |
+ return; |
| 24 |
+ } |
| 25 |
|
| 26 |
/* |
| 27 |
* Set up a proper reference between $_SESSION["x"] and $x. |
| 28 |
@@ -281,11 +285,10 @@ |
| 29 |
if (PG(register_globals)) { |
| 30 |
zval **sym_global = NULL; |
| 31 |
|
| 32 |
- zend_hash_find(&EG(symbol_table), name, namelen + 1, |
| 33 |
- (void *) &sym_global); |
| 34 |
- |
| 35 |
- if ((Z_TYPE_PP(sym_global) == IS_ARRAY && Z_ARRVAL_PP(sym_global) == &EG(symbol_table)) || *sym_global == PS(http_session_vars)) { |
| 36 |
- return; |
| 37 |
+ if (zend_hash_find(&EG(symbol_table), name, namelen + 1, (void *) &sym_global) == SUCCESS) { |
| 38 |
+ if ((Z_TYPE_PP(sym_global) == IS_ARRAY && Z_ARRVAL_PP(sym_global) == &EG(symbol_table)) || *sym_global == PS(http_session_vars)) { |
| 39 |
+ return; |
| 40 |
+ } |
| 41 |
} |
| 42 |
|
| 43 |
if (sym_global == NULL && sym_track == NULL) { |