dmitry Fri Jul 25 08:23:08 2008 UTC
Modified files: (Branch: PHP_5_3)
/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 uninitialised data
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.20.2.24.2.44&r2=1.331.2.20.2.24.2.45&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.44
ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.45
--- ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.44 Thu Jul 24 09:42:15 2008
+++ ZendEngine2/zend_execute_API.c Fri Jul 25 08:23:06 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.44 2008/07/24 09:42:15 dmitry
Exp $ */
+/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.45 2008/07/25 08:23:06 dmitry
Exp $ */
#include <stdio.h>
#include <signal.h>
@@ -1254,6 +1254,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.31.2.3.2.7.2.3&r2=1.31.2.3.2.7.2.4&diff_format=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.31.2.3.2.7.2.3
php-src/main/streams/userspace.c:1.31.2.3.2.7.2.4
--- php-src/main/streams/userspace.c:1.31.2.3.2.7.2.3 Fri Jul 11 10:25:15 2008
+++ php-src/main/streams/userspace.c Fri Jul 25 08:23:06 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: userspace.c,v 1.31.2.3.2.7.2.3 2008/07/11 10:25:15 tony2001 Exp $ */
+/* $Id: userspace.c,v 1.31.2.3.2.7.2.4 2008/07/25 08:23:06 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.213.2.6.2.16.2.24&r2=1.213.2.6.2.16.2.25&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.24
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.25
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.24 Tue Jul 22 23:44:23 2008
+++ php-src/ext/mysql/php_mysql.c Fri Jul 25 08:23:06 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.24 2008/07/22 23:44:23 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.25 2008/07/25 08:23:06 dmitry Exp $ */
/* TODO:
*
@@ -2176,6 +2176,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.72.2.16.2.17.2.28&r2=1.72.2.16.2.17.2.29&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.28
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.29
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.28 Mon Jul 21 12:58:51 2008
+++ php-src/ext/mysqli/mysqli.c Fri Jul 25 08:23:06 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.28 2008/07/21 12:58:51 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.29 2008/07/25 08:23:06 dmitry Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1305,6 +1305,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.82.2.31.2.17.2.10&r2=1.82.2.31.2.17.2.11&diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.10
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.11
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.10 Tue Apr 22 13:01:45 2008
+++ php-src/ext/pdo/pdo_dbh.c Fri Jul 25 08:23:06 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.10 2008/04/22 13:01:45 iliaa Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.11 2008/07/25 08:23:06 dmitry Exp $ */
/* The PDO Database Handle Class */
@@ -477,6 +477,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.118.2.38.2.24.2.17&r2=1.118.2.38.2.24.2.18&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.17
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.18
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.17 Mon Jul 21 13:09:28 2008
+++ php-src/ext/pdo/pdo_stmt.c Fri Jul 25 08:23:06 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.17 2008/07/21 13:09:28 johannes Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.18 2008/07/25 08:23:06 dmitry Exp $ */
/* The PDO Statement Handle Class */
@@ -760,6 +760,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);
@@ -859,6 +860,7 @@
fcc->initialized = 1;
fcc->function_handler = function_handler;
fcc->calling_scope = EG(scope);
+ fcc->called_scope = Z_OBJCE_P(object);
fcc->object_pp = object;
return 1;
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.331.2.13.2.24.2.10&r2=1.331.2.13.2.24.2.11&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.10
php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.11
--- php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.10 Wed Jul 23 00:17:19 2008
+++ php-src/ext/pgsql/pgsql.c Fri Jul 25 08:23:07 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.331.2.13.2.24.2.10 2008/07/23 00:17:19 hholzgra Exp $ */
+/* $Id: pgsql.c,v 1.331.2.13.2.24.2.11 2008/07/25 08:23:07 dmitry Exp $ */
#include <stdlib.h>
@@ -2639,6 +2639,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.164.2.33.2.45.2.21&r2=1.164.2.33.2.45.2.22&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.21
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.22
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.21 Thu Jul
24 19:52:23 2008
+++ php-src/ext/reflection/php_reflection.c Fri Jul 25 08:23:07 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.21 2008/07/24 19:52:23 felipe Exp
$ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.22 2008/07/25 08:23:07 dmitry Exp
$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1235,6 +1235,7 @@
fcc.initialized = 1;
fcc.function_handler = ce_ptr->constructor;
fcc.calling_scope = ce_ptr;
+ fcc.called_scope = Z_OBJCE_P(reflection_ptr);
fcc.object_pp = &reflector_ptr;
result = zend_call_function(&fci, &fcc TSRMLS_CC);
@@ -1609,6 +1610,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);
@@ -1673,6 +1675,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);
@@ -2413,6 +2416,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);
@@ -2519,6 +2523,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);
@@ -3548,6 +3553,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) {
@@ -3627,6 +3633,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) {
@@ -5110,7 +5117,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.164.2.33.2.45.2.21 2008/07/24 19:52:23 felipe Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.45.2.22 2008/07/25 08:23:07 dmitry Exp $");
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23.2.27&r2=1.45.2.27.2.23.2.28&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.27
php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.28
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.27 Thu Jul 24 08:55:52 2008
+++ php-src/ext/spl/spl_directory.c Fri Jul 25 08:23:07 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.27 2008/07/24 08:55:52 sfox Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.28 2008/07/25 08:23:07 dmitry Exp $
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1812,6 +1812,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.166.2.13.2.9.2.8&r2=1.166.2.13.2.9.2.9&diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.8
php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.9
--- php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.8 Sat Jul 5 20:12:56 2008
+++ php-src/ext/sqlite/sqlite.c Fri Jul 25 08:23:07 2008
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.166.2.13.2.9.2.8 2008/07/05 20:12:56 felipe Exp $
+ $Id: sqlite.c,v 1.166.2.13.2.9.2.9 2008/07/25 08:23:07 dmitry Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1520,7 +1520,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.166.2.13.2.9.2.8 2008/07/05
20:12:56 felipe Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.9.2.9 2008/07/25
08:23:07 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();
@@ -2507,6 +2507,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) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
