cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli.c /ext/pdo pdo_dbh.c pdo_stmt.c /ext/pgsql pgsql.c /ext/reflection php_reflection.c
/ext/spl spl_directory.c /ext/sqlite sqlite.c /main/streams userspace.c ZendEngine2 zend_execute_API.c
| From: | Dmitry Stogov | Date: | Fri, 25 Jul 2008 08:53:11 +0000 |
| Subject: | cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli.c /ext/pdo pdo_dbh.c pdo_stmt.c /ext/pgsql pgsql.c /ext/reflection php_reflection.c /ext/spl spl_directory.c /ext/sqlite sqlite.c /main/streams userspace.c ZendEngine2 zend_execute_API.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-51563@lists.php.net to get a copy of this message | ||
dmitry Fri Jul 25 08:53:11 2008 UTC
Modified files:
/ZendEngine2 zend_execute_API.c
/php-src/main/streams userspace.c
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/pdo pdo_dbh.c pdo_stmt.c
/php-src/ext/pgsql pgsql.c
/php-src/ext/reflection php_reflection.c
/php-src/ext/spl spl_directory.c
/php-src/ext/sqlite sqlite.c
Log:
Fixed uninitialized data
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.452&r2=1.453&diff_format=u Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.452 ZendEngine2/zend_execute_API.c:1.453 --- ZendEngine2/zend_execute_API.c:1.452 Thu Jul 24 10:13:59 2008 +++ ZendEngine2/zend_execute_API.c Fri Jul 25 08:53:11 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.452 2008/07/24 10:13:59 dmitry Exp $ */ +/* $Id: zend_execute_API.c,v 1.453 2008/07/25 08:53:11 dmitry Exp $ */ #include <stdio.h> #include <signal.h> @@ -1380,6 +1380,7 @@ fcall_cache.initialized = EG(autoload_func) ? 1 : 0; fcall_cache.function_handler = EG(autoload_func); fcall_cache.calling_scope = NULL; + fcall_cache.called_scope = NULL; fcall_cache.object_pp = NULL; exception = EG(exception); http://cvs.php.net/viewvc.cgi/php-src/main/streams/userspace.c?r1=1.47&r2=1.48&diff_format=u Index: php-src/main/streams/userspace.c diff -u php-src/main/streams/userspace.c:1.47 php-src/main/streams/userspace.c:1.48 --- php-src/main/streams/userspace.c:1.47 Fri Jul 11 10:24:29 2008 +++ php-src/main/streams/userspace.c Fri Jul 25 08:53:11 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: userspace.c,v 1.47 2008/07/11 10:24:29 tony2001 Exp $ */ +/* $Id: userspace.c,v 1.48 2008/07/25 08:53:11 dmitry Exp $ */ #include "php.h" #include "php_globals.h" @@ -262,6 +262,7 @@ fcc.initialized = 1; fcc.function_handler = uwrap->ce->constructor; fcc.calling_scope = EG(scope); + fcc.called_scope = Z_OBJCE_P(us->object); fcc.object_pp = &us->object; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.263&r2=1.264&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.263 php-src/ext/mysql/php_mysql.c:1.264 --- php-src/ext/mysql/php_mysql.c:1.263 Tue Jul 22 23:43:14 2008 +++ php-src/ext/mysql/php_mysql.c Fri Jul 25 08:53:11 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.263 2008/07/22 23:43:14 andrey Exp $ */ +/* $Id: php_mysql.c,v 1.264 2008/07/25 08:53:11 dmitry Exp $ */ /* TODO: * @@ -2209,6 +2209,7 @@ fcc.initialized = 1; fcc.function_handler = ce->constructor; fcc.calling_scope = EG(scope); + fcc.called_scope = Z_OBJCE_P(return_value); fcc.object_pp = &return_value; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.131&r2=1.132&diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.131 php-src/ext/mysqli/mysqli.c:1.132 --- php-src/ext/mysqli/mysqli.c:1.131 Mon Jul 21 13:01:41 2008 +++ php-src/ext/mysqli/mysqli.c Fri Jul 25 08:53:11 2008 @@ -17,7 +17,7 @@ | Ulf Wendel <uw@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli.c,v 1.131 2008/07/21 13:01:41 andrey Exp $ + $Id: mysqli.c,v 1.132 2008/07/25 08:53:11 dmitry Exp $ */ #ifdef HAVE_CONFIG_H @@ -1343,6 +1343,7 @@ fcc.initialized = 1; fcc.function_handler = ce->constructor; fcc.calling_scope = EG(scope); + fcc.called_scope = Z_OBJCE_P(return_value); fcc.object_pp = &return_value; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.150&r2=1.151&diff_format=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.150 php-src/ext/pdo/pdo_dbh.c:1.151 --- php-src/ext/pdo/pdo_dbh.c:1.150 Mon Mar 10 14:35:37 2008 +++ php-src/ext/pdo/pdo_dbh.c Fri Jul 25 08:53:11 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_dbh.c,v 1.150 2008/03/10 14:35:37 gwynne Exp $ */ +/* $Id: pdo_dbh.c,v 1.151 2008/07/25 08:53:11 dmitry Exp $ */ /* The PDO Database Handle Class */ @@ -483,6 +483,7 @@ fcc.initialized = 1; fcc.function_handler = dbstmt_ce->constructor; fcc.calling_scope = EG(scope); + fcc.called_scope = Z_OBJCE_P(object); fcc.object_pp = &object; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.194&r2=1.195&diff_format=u Index: php-src/ext/pdo/pdo_stmt.c diff -u php-src/ext/pdo/pdo_stmt.c:1.194 php-src/ext/pdo/pdo_stmt.c:1.195 --- php-src/ext/pdo/pdo_stmt.c:1.194 Mon Jul 21 13:05:51 2008 +++ php-src/ext/pdo/pdo_stmt.c Fri Jul 25 08:53:11 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_stmt.c,v 1.194 2008/07/21 13:05:51 johannes Exp $ */ +/* $Id: pdo_stmt.c,v 1.195 2008/07/25 08:53:11 dmitry Exp $ */ /* The PDO Statement Handle Class */ @@ -753,6 +753,7 @@ fcc->initialized = 1; fcc->function_handler = ce->constructor; fcc->calling_scope = EG(scope); + fcc->called_scope = ce; return 1; } else if (stmt->fetch.cls.ctor_args) { pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied class does not have a constructor, use NULL for the ctor_params parameter, or simply omit it" TSRMLS_CC); @@ -849,6 +850,7 @@ fcc->initialized = 1; fcc->function_handler = function_handler; fcc->calling_scope = EG(scope); + fcc->called_scope = Z_OBJCE_PP(object); fcc->object_pp = object; return 1; http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.382&r2=1.383&diff_format=u Index: php-src/ext/pgsql/pgsql.c diff -u php-src/ext/pgsql/pgsql.c:1.382 php-src/ext/pgsql/pgsql.c:1.383 --- php-src/ext/pgsql/pgsql.c:1.382 Wed Jul 23 09:27:01 2008 +++ php-src/ext/pgsql/pgsql.c Fri Jul 25 08:53:11 2008 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.382 2008/07/23 09:27:01 hholzgra Exp $ */ +/* $Id: pgsql.c,v 1.383 2008/07/25 08:53:11 dmitry Exp $ */ #include <stdlib.h> @@ -2625,6 +2625,7 @@ fcc.initialized = 1; fcc.function_handler = ce->constructor; fcc.calling_scope = EG(scope); + fcc.called_scope = Z_OBJCE_P(return_value); fcc.object_pp = &return_value; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.301&r2=1.302&diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.301 php-src/ext/reflection/php_reflection.c:1.302 --- php-src/ext/reflection/php_reflection.c:1.301 Thu Jul 24 19:50:22 2008 +++ php-src/ext/reflection/php_reflection.c Fri Jul 25 08:53:11 2008 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_reflection.c,v 1.301 2008/07/24 19:50:22 felipe Exp $ */ +/* $Id: php_reflection.c,v 1.302 2008/07/25 08:53:11 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1256,6 +1256,7 @@ fcc.initialized = 1; fcc.function_handler = ce_ptr->constructor; fcc.calling_scope = ce_ptr; + fcc.called_scope = Z_OBJCE_P(reflector_ptr); fcc.object_pp = &reflector_ptr; result = zend_call_function(&fci, &fcc TSRMLS_CC); @@ -1637,6 +1638,7 @@ fcc.initialized = 1; fcc.function_handler = fptr; fcc.calling_scope = EG(scope); + fcc.called_scope = NULL; fcc.object_pp = NULL; result = zend_call_function(&fci, &fcc TSRMLS_CC); @@ -1701,6 +1703,7 @@ fcc.initialized = 1; fcc.function_handler = fptr; fcc.calling_scope = EG(scope); + fcc.called_scope = NULL; fcc.object_pp = NULL; result = zend_call_function(&fci, &fcc TSRMLS_CC); @@ -2462,6 +2465,7 @@ fcc.initialized = 1; fcc.function_handler = mptr; fcc.calling_scope = obj_ce; + fcc.called_scope = Z_OBJCE_PP(object_pp); fcc.object_pp = object_pp; result = zend_call_function(&fci, &fcc TSRMLS_CC); @@ -2566,6 +2570,7 @@ fcc.initialized = 1; fcc.function_handler = mptr; fcc.calling_scope = obj_ce; + fcc.called_scope = Z_OBJCE_P(object); fcc.object_pp = &object; result = zend_call_function(&fci, &fcc TSRMLS_CC); @@ -3645,6 +3650,7 @@ fcc.initialized = 1; fcc.function_handler = ce->constructor; fcc.calling_scope = EG(scope); + fcc.called_scope = Z_OBJCE_P(return_value); fcc.object_pp = &return_value; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { @@ -3720,6 +3726,7 @@ fcc.initialized = 1; fcc.function_handler = ce->constructor; fcc.calling_scope = EG(scope); + fcc.called_scope = Z_OBJCE_P(return_value); fcc.object_pp = &return_value; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { @@ -5252,7 +5259,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Reflection", "enabled"); - php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.301 2008/07/24 19:50:22 felipe Exp $"); + php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.302 2008/07/25 08:53:11 dmitry Exp $"); php_info_print_table_end(); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.162&r2=1.163&diff_format=u Index: php-src/ext/spl/spl_directory.c diff -u php-src/ext/spl/spl_directory.c:1.162 php-src/ext/spl/spl_directory.c:1.163 --- php-src/ext/spl/spl_directory.c:1.162 Thu Jul 24 08:52:24 2008 +++ php-src/ext/spl/spl_directory.c Fri Jul 25 08:53:11 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_directory.c,v 1.162 2008/07/24 08:52:24 sfox Exp $ */ +/* $Id: spl_directory.c,v 1.163 2008/07/25 08:53:11 dmitry Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1958,6 +1958,7 @@ fcic.initialized = 1; fcic.function_handler = func_ptr; fcic.calling_scope = NULL; + fcic.called_scope = NULL; fcic.object_pp = NULL; result = zend_call_function(&fci, &fcic TSRMLS_CC); http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.210&r2=1.211&diff_format=u Index: php-src/ext/sqlite/sqlite.c diff -u php-src/ext/sqlite/sqlite.c:1.210 php-src/ext/sqlite/sqlite.c:1.211 --- php-src/ext/sqlite/sqlite.c:1.210 Sat Jul 5 20:16:34 2008 +++ php-src/ext/sqlite/sqlite.c Fri Jul 25 08:53:11 2008 @@ -17,7 +17,7 @@ | Marcus Boerger <helly@php.net> | +----------------------------------------------------------------------+ - $Id: sqlite.c,v 1.210 2008/07/05 20:16:34 felipe Exp $ + $Id: sqlite.c,v 1.211 2008/07/25 08:53:11 dmitry Exp $ */ #ifdef HAVE_CONFIG_H @@ -1612,7 +1612,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "SQLite support", "enabled"); - php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.210 2008/07/05 20:16:34 felipe Exp $"); + php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.211 2008/07/25 08:53:11 dmitry Exp $"); php_info_print_table_row(2, "SQLite Library", sqlite_libversion()); php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding()); php_info_print_table_end(); @@ -2711,6 +2711,7 @@ fcc.initialized = 1; fcc.function_handler = ce->constructor; fcc.calling_scope = EG(scope); + fcc.called_scope = Z_OBJCE_P(return_value); fcc.object_pp = &return_value; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) {
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.452&r2=1.453&diff_format=u Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.452 ZendEngine2/zend_execute_API.c:1.453 --- ZendEngine2/zend_execute_API.c:1.452 Thu Jul 24 10:13:59 2008 +++ ZendEngine2/zend_execute_API.c Fri Jul 25 08:53:11 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.452 2008/07/24 10:13:59 dmitry Exp $ */ +/* $Id: zend_execute_API.c,v 1.453 2008/07/25 08:53:11 dmitry Exp $ */ #include <stdio.h> #include <signal.h> @@ -1380,6 +1380,7 @@ fcall_cache.initialized = EG(autoload_func) ? 1 : 0; fcall_cache.function_handler = EG(autoload_func); fcall_cache.calling_scope = NULL; + fcall_cache.called_scope = NULL; fcall_cache.object_pp = NULL; exception = EG(exception); http://cvs.php.net/viewvc.cgi/php-src/main/streams/userspace.c?r1=1.47&r2=1.48&diff_format=u Index: php-src/main/streams/userspace.c diff -u php-src/main/streams/userspace.c:1.47 php-src/main/streams/userspace.c:1.48 --- php-src/main/streams/userspace.c:1.47 Fri Jul 11 10:24:29 2008 +++ php-src/main/streams/userspace.c Fri Jul 25 08:53:11 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: userspace.c,v 1.47 2008/07/11 10:24:29 tony2001 Exp $ */ +/* $Id: userspace.c,v 1.48 2008/07/25 08:53:11 dmitry Exp $ */ #include "php.h" #include "php_globals.h" @@ -262,6 +262,7 @@ fcc.initialized = 1; fcc.function_handler = uwrap->ce->constructor; fcc.calling_scope = EG(scope); + fcc.called_scope = Z_OBJCE_P(us->object); fcc.object_pp = &us->object; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.263&r2=1.264&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.263 php-src/ext/mysql/php_mysql.c:1.264 --- php-src/ext/mysql/php_mysql.c:1.263 Tue Jul 22 23:43:14 2008 +++ php-src/ext/mysql/php_mysql.c Fri Jul 25 08:53:11 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.263 2008/07/22 23:43:14 andrey Exp $ */ +/* $Id: php_mysql.c,v 1.264 2008/07/25 08:53:11 dmitry Exp $ */ /* TODO: * @@ -2209,6 +2209,7 @@ fcc.initialized = 1; fcc.function_handler = ce->constructor; fcc.calling_scope = EG(scope); + fcc.called_scope = Z_OBJCE_P(return_value); fcc.object_pp = &return_value; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.131&r2=1.132&diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.131 php-src/ext/mysqli/mysqli.c:1.132 --- php-src/ext/mysqli/mysqli.c:1.131 Mon Jul 21 13:01:41 2008 +++ php-src/ext/mysqli/mysqli.c Fri Jul 25 08:53:11 2008 @@ -17,7 +17,7 @@ | Ulf Wendel <uw@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli.c,v 1.131 2008/07/21 13:01:41 andrey Exp $ + $Id: mysqli.c,v 1.132 2008/07/25 08:53:11 dmitry Exp $ */ #ifdef HAVE_CONFIG_H @@ -1343,6 +1343,7 @@ fcc.initialized = 1; fcc.function_handler = ce->constructor; fcc.calling_scope = EG(scope); + fcc.called_scope = Z_OBJCE_P(return_value); fcc.object_pp = &return_value; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.150&r2=1.151&diff_format=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.150 php-src/ext/pdo/pdo_dbh.c:1.151 --- php-src/ext/pdo/pdo_dbh.c:1.150 Mon Mar 10 14:35:37 2008 +++ php-src/ext/pdo/pdo_dbh.c Fri Jul 25 08:53:11 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_dbh.c,v 1.150 2008/03/10 14:35:37 gwynne Exp $ */ +/* $Id: pdo_dbh.c,v 1.151 2008/07/25 08:53:11 dmitry Exp $ */ /* The PDO Database Handle Class */ @@ -483,6 +483,7 @@ fcc.initialized = 1; fcc.function_handler = dbstmt_ce->constructor; fcc.calling_scope = EG(scope); + fcc.called_scope = Z_OBJCE_P(object); fcc.object_pp = &object; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.194&r2=1.195&diff_format=u Index: php-src/ext/pdo/pdo_stmt.c diff -u php-src/ext/pdo/pdo_stmt.c:1.194 php-src/ext/pdo/pdo_stmt.c:1.195 --- php-src/ext/pdo/pdo_stmt.c:1.194 Mon Jul 21 13:05:51 2008 +++ php-src/ext/pdo/pdo_stmt.c Fri Jul 25 08:53:11 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_stmt.c,v 1.194 2008/07/21 13:05:51 johannes Exp $ */ +/* $Id: pdo_stmt.c,v 1.195 2008/07/25 08:53:11 dmitry Exp $ */ /* The PDO Statement Handle Class */ @@ -753,6 +753,7 @@ fcc->initialized = 1; fcc->function_handler = ce->constructor; fcc->calling_scope = EG(scope); + fcc->called_scope = ce; return 1; } else if (stmt->fetch.cls.ctor_args) { pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied class does not have a constructor, use NULL for the ctor_params parameter, or simply omit it" TSRMLS_CC); @@ -849,6 +850,7 @@ fcc->initialized = 1; fcc->function_handler = function_handler; fcc->calling_scope = EG(scope); + fcc->called_scope = Z_OBJCE_PP(object); fcc->object_pp = object; return 1; http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.382&r2=1.383&diff_format=u Index: php-src/ext/pgsql/pgsql.c diff -u php-src/ext/pgsql/pgsql.c:1.382 php-src/ext/pgsql/pgsql.c:1.383 --- php-src/ext/pgsql/pgsql.c:1.382 Wed Jul 23 09:27:01 2008 +++ php-src/ext/pgsql/pgsql.c Fri Jul 25 08:53:11 2008 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.382 2008/07/23 09:27:01 hholzgra Exp $ */ +/* $Id: pgsql.c,v 1.383 2008/07/25 08:53:11 dmitry Exp $ */ #include <stdlib.h> @@ -2625,6 +2625,7 @@ fcc.initialized = 1; fcc.function_handler = ce->constructor; fcc.calling_scope = EG(scope); + fcc.called_scope = Z_OBJCE_P(return_value); fcc.object_pp = &return_value; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.301&r2=1.302&diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.301 php-src/ext/reflection/php_reflection.c:1.302 --- php-src/ext/reflection/php_reflection.c:1.301 Thu Jul 24 19:50:22 2008 +++ php-src/ext/reflection/php_reflection.c Fri Jul 25 08:53:11 2008 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_reflection.c,v 1.301 2008/07/24 19:50:22 felipe Exp $ */ +/* $Id: php_reflection.c,v 1.302 2008/07/25 08:53:11 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1256,6 +1256,7 @@ fcc.initialized = 1; fcc.function_handler = ce_ptr->constructor; fcc.calling_scope = ce_ptr; + fcc.called_scope = Z_OBJCE_P(reflector_ptr); fcc.object_pp = &reflector_ptr; result = zend_call_function(&fci, &fcc TSRMLS_CC); @@ -1637,6 +1638,7 @@ fcc.initialized = 1; fcc.function_handler = fptr; fcc.calling_scope = EG(scope); + fcc.called_scope = NULL; fcc.object_pp = NULL; result = zend_call_function(&fci, &fcc TSRMLS_CC); @@ -1701,6 +1703,7 @@ fcc.initialized = 1; fcc.function_handler = fptr; fcc.calling_scope = EG(scope); + fcc.called_scope = NULL; fcc.object_pp = NULL; result = zend_call_function(&fci, &fcc TSRMLS_CC); @@ -2462,6 +2465,7 @@ fcc.initialized = 1; fcc.function_handler = mptr; fcc.calling_scope = obj_ce; + fcc.called_scope = Z_OBJCE_PP(object_pp); fcc.object_pp = object_pp; result = zend_call_function(&fci, &fcc TSRMLS_CC); @@ -2566,6 +2570,7 @@ fcc.initialized = 1; fcc.function_handler = mptr; fcc.calling_scope = obj_ce; + fcc.called_scope = Z_OBJCE_P(object); fcc.object_pp = &object; result = zend_call_function(&fci, &fcc TSRMLS_CC); @@ -3645,6 +3650,7 @@ fcc.initialized = 1; fcc.function_handler = ce->constructor; fcc.calling_scope = EG(scope); + fcc.called_scope = Z_OBJCE_P(return_value); fcc.object_pp = &return_value; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { @@ -3720,6 +3726,7 @@ fcc.initialized = 1; fcc.function_handler = ce->constructor; fcc.calling_scope = EG(scope); + fcc.called_scope = Z_OBJCE_P(return_value); fcc.object_pp = &return_value; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { @@ -5252,7 +5259,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Reflection", "enabled"); - php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.301 2008/07/24 19:50:22 felipe Exp $"); + php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.302 2008/07/25 08:53:11 dmitry Exp $"); php_info_print_table_end(); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.162&r2=1.163&diff_format=u Index: php-src/ext/spl/spl_directory.c diff -u php-src/ext/spl/spl_directory.c:1.162 php-src/ext/spl/spl_directory.c:1.163 --- php-src/ext/spl/spl_directory.c:1.162 Thu Jul 24 08:52:24 2008 +++ php-src/ext/spl/spl_directory.c Fri Jul 25 08:53:11 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_directory.c,v 1.162 2008/07/24 08:52:24 sfox Exp $ */ +/* $Id: spl_directory.c,v 1.163 2008/07/25 08:53:11 dmitry Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1958,6 +1958,7 @@ fcic.initialized = 1; fcic.function_handler = func_ptr; fcic.calling_scope = NULL; + fcic.called_scope = NULL; fcic.object_pp = NULL; result = zend_call_function(&fci, &fcic TSRMLS_CC); http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.210&r2=1.211&diff_format=u Index: php-src/ext/sqlite/sqlite.c diff -u php-src/ext/sqlite/sqlite.c:1.210 php-src/ext/sqlite/sqlite.c:1.211 --- php-src/ext/sqlite/sqlite.c:1.210 Sat Jul 5 20:16:34 2008 +++ php-src/ext/sqlite/sqlite.c Fri Jul 25 08:53:11 2008 @@ -17,7 +17,7 @@ | Marcus Boerger <helly@php.net> | +----------------------------------------------------------------------+ - $Id: sqlite.c,v 1.210 2008/07/05 20:16:34 felipe Exp $ + $Id: sqlite.c,v 1.211 2008/07/25 08:53:11 dmitry Exp $ */ #ifdef HAVE_CONFIG_H @@ -1612,7 +1612,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "SQLite support", "enabled"); - php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.210 2008/07/05 20:16:34 felipe Exp $"); + php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.211 2008/07/25 08:53:11 dmitry Exp $"); php_info_print_table_row(2, "SQLite Library", sqlite_libversion()); php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding()); php_info_print_table_end(); @@ -2711,6 +2711,7 @@ fcc.initialized = 1; fcc.function_handler = ce->constructor; fcc.calling_scope = EG(scope); + fcc.called_scope = Z_OBJCE_P(return_value); fcc.object_pp = &return_value; if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) {