cvs: php-src(PHP_5_2) /ext/session session.c

From: Date: Wed, 10 Jan 2007 07:04:49 +0000
Subject: cvs: php-src(PHP_5_2) /ext/session session.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-42645@lists.php.net to get a copy of this message
dmitry Wed Jan 10 07:04:49 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/session session.c Log: Fixed SIGSEGV http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.25&r2=1.417.2.8.2.26&diff_format=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.417.2.8.2.25 php-src/ext/session/session.c:1.417.2.8.2.26 --- php-src/ext/session/session.c:1.417.2.8.2.25 Tue Jan 9 15:31:12 2007 +++ php-src/ext/session/session.c Wed Jan 10 07:04:49 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.417.2.8.2.25 2007/01/09 15:31:12 iliaa Exp $ */ +/* $Id: session.c,v 1.417.2.8.2.26 2007/01/10 07:04:49 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -328,11 +328,10 @@ if (PG(register_globals)) { zval **sym_global = NULL; - zend_hash_find(&EG(symbol_table), name, namelen + 1, - (void *) &sym_global); - - if ((Z_TYPE_PP(sym_global) == IS_ARRAY && Z_ARRVAL_PP(sym_global) == &EG(symbol_table)) || *sym_global == PS(http_session_vars)) { - return; + if (zend_hash_find(&EG(symbol_table), name, namelen + 1, (void *) &sym_global) == SUCCESS) { + if ((Z_TYPE_PP(sym_global) == IS_ARRAY && Z_ARRVAL_PP(sym_global) == &EG(symbol_table)) || *sym_global == PS(http_session_vars)) { + return; + } } if (sym_global == NULL && sym_track == NULL) {

« previous php.cvs (#42645) next »