dmitry Thu Nov 27 19:02:46 2008 UTC
Modified files:
/ZendEngine2 zend_API.c zend_API.h zend_closures.c zend_closures.h
zend_exceptions.c zend_execute_API.c zend_interfaces.c
zend_object_handlers.c zend_object_handlers.h
zend_vm_def.h zend_vm_execute.h
/ZendEngine2/tests bug46409.phpt
/php-src/ext/curl interface.c
/php-src/ext/dom xpath.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/pdo_sqlite sqlite_driver.c
/php-src/ext/pgsql pgsql.c
/php-src/ext/reflection php_reflection.c
/php-src/ext/soap soap.c
/php-src/ext/spl php_spl.c spl_directory.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/sqlite3 sqlite3.c
/php-src/ext/xml xml.c
/php-src/ext/xsl xsltprocessor.c
/php-src/main/streams userspace.c
Log:
Fixed bug #46409 (__invoke method called outside of object context when using
array_map)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.492&r2=1.493&diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.492 ZendEngine2/zend_API.c:1.493
--- ZendEngine2/zend_API.c:1.492 Tue Nov 25 22:23:28 2008
+++ ZendEngine2/zend_API.c Thu Nov 27 19:02:43 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.c,v 1.492 2008/11/25 22:23:28 stas Exp $ */
+/* $Id: zend_API.c,v 1.493 2008/11/27 19:02:43 dmitry Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -2713,8 +2713,8 @@
} else {
fcc->called_scope = EG(called_scope);
fcc->calling_scope = EG(scope);
- if (!fcc->object_pp) {
- fcc->object_pp = EG(This) ? &EG(This) : NULL;
+ if (!fcc->object_ptr) {
+ fcc->object_ptr = EG(This);
}
ret = 1;
}
@@ -2727,8 +2727,8 @@
} else {
fcc->called_scope = EG(called_scope);
fcc->calling_scope = EG(scope)->parent;
- if (!fcc->object_pp) {
- fcc->object_pp = EG(This) ? &EG(This) : NULL;
+ if (!fcc->object_ptr) {
+ fcc->object_ptr = EG(This);
}
ret = 1;
}
@@ -2739,8 +2739,8 @@
} else {
fcc->called_scope = EG(called_scope);
fcc->calling_scope = EG(called_scope);
- if (!fcc->object_pp) {
- fcc->object_pp = EG(This) ? &EG(This) : NULL;
+ if (!fcc->object_ptr) {
+ fcc->object_ptr = EG(This);
}
ret = 1;
}
@@ -2748,13 +2748,13 @@
zend_class_entry *scope = EG(active_op_array) ?
EG(active_op_array)->scope : NULL;
fcc->calling_scope = *pce;
- if (scope && !fcc->object_pp && EG(This) &&
+ if (scope && !fcc->object_ptr && EG(This) &&
instanceof_function(Z_OBJCE_P(EG(This)), scope TSRMLS_CC) &&
instanceof_function(scope, fcc->calling_scope TSRMLS_CC)) {
- fcc->object_pp = &EG(This);
- fcc->called_scope = Z_OBJCE_PP(fcc->object_pp);
+ fcc->object_ptr = EG(This);
+ fcc->called_scope = Z_OBJCE_P(fcc->object_ptr);
} else {
- fcc->called_scope = fcc->object_pp ?
Z_OBJCE_PP(fcc->object_pp) : fcc->calling_scope;
+ fcc->called_scope = fcc->object_ptr ?
Z_OBJCE_P(fcc->object_ptr) : fcc->calling_scope;
}
ret = 1;
} else {
@@ -2896,8 +2896,8 @@
fcc->function_handler = priv_fbc;
}
}
- } else if (fcc->object_pp) {
- if (Z_OBJ_HT_PP(fcc->object_pp)->get_method) {
+ } else if (fcc->object_ptr) {
+ if (Z_OBJ_HT_P(fcc->object_ptr)->get_method) {
zstr method = mname;
int method_len = mlen;
@@ -2906,7 +2906,7 @@
} else if (!UG(unicode) && Z_TYPE_P(callable) ==
IS_UNICODE) {
zend_unicode_to_string(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &method.s,
&method_len, mname.u, mlen TSRMLS_CC);
}
- fcc->function_handler =
Z_OBJ_HT_PP(fcc->object_pp)->get_method(fcc->object_pp, method, method_len
TSRMLS_CC);
+ fcc->function_handler =
Z_OBJ_HT_P(fcc->object_ptr)->get_method(&fcc->object_ptr, method, method_len
TSRMLS_CC);
if (method.v != mname.v) {
efree(method.v);
}
@@ -2925,7 +2925,7 @@
if (retval) {
if (fcc->calling_scope && !call_via_handler) {
- if (!fcc->object_pp &&
!(fcc->function_handler->common.fn_flags & ZEND_ACC_STATIC)) {
+ if (!fcc->object_ptr &&
!(fcc->function_handler->common.fn_flags & ZEND_ACC_STATIC)) {
int severity;
char *verb;
if (fcc->function_handler->common.fn_flags &
ZEND_ACC_ALLOW_STATIC) {
@@ -2940,7 +2940,7 @@
retval = 0;
}
if (EG(This) &&
instanceof_function(Z_OBJCE_P(EG(This)), fcc->calling_scope TSRMLS_CC)) {
- fcc->object_pp = &EG(This);
+ fcc->object_ptr = EG(This);
if (error) {
zend_spprintf(error, 0,
"non-static method %v::%v() %s be called statically, assuming $this from
compatible context %v", fcc->calling_scope->name,
fcc->function_handler->common.function_name, verb, Z_OBJCE_P(EG(This))->name);
} else if (retval) {
@@ -2956,7 +2956,7 @@
}
if (retval && (check_flags &
IS_CALLABLE_CHECK_NO_ACCESS) == 0) {
if (fcc->function_handler->op_array.fn_flags &
ZEND_ACC_PRIVATE) {
- if
(!zend_check_private(fcc->function_handler, fcc->object_pp ?
Z_OBJCE_PP(fcc->object_pp) : EG(scope), lmname, lmlen TSRMLS_CC)) {
+ if
(!zend_check_private(fcc->function_handler, fcc->object_ptr ?
Z_OBJCE_P(fcc->object_ptr) : EG(scope), lmname, lmlen TSRMLS_CC)) {
if (error) {
if (*error) {
efree(*error);
@@ -2987,8 +2987,8 @@
}
efree(lmname.v);
- if (fcc->object_pp) {
- fcc->called_scope = Z_OBJCE_PP(fcc->object_pp);
+ if (fcc->object_ptr) {
+ fcc->called_scope = Z_OBJCE_P(fcc->object_ptr);
}
if (retval) {
fcc->initialized = 1;
@@ -2997,7 +2997,7 @@
}
/* }}} */
-ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval **object_pp, uint
check_flags, zval *callable_name, zend_fcall_info_cache *fcc, char **error
TSRMLS_DC) /* {{{ */
+ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint
check_flags, zval *callable_name, zend_fcall_info_cache *fcc, char **error
TSRMLS_DC) /* {{{ */
{
zend_bool ret;
zend_fcall_info_cache fcc_local;
@@ -3017,23 +3017,23 @@
fcc->called_scope = NULL;
fcc->function_handler = NULL;
fcc->calling_scope = NULL;
- fcc->object_pp = NULL;
+ fcc->object_ptr = NULL;
- if (object_pp && (!*object_pp || Z_TYPE_PP(object_pp) != IS_OBJECT)) {
- object_pp = NULL;
+ if (object_ptr && Z_TYPE_P(object_ptr) != IS_OBJECT) {
+ object_ptr = NULL;
}
- if (object_pp && Z_TYPE_PP(object_pp) == IS_OBJECT &&
+ if (object_ptr && Z_TYPE_P(object_ptr) == IS_OBJECT &&
(!EG(objects_store).object_buckets ||
-
!EG(objects_store).object_buckets[Z_OBJ_HANDLE_PP(object_pp)].valid)) {
+
!EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(object_ptr)].valid)) {
return 0;
}
switch (Z_TYPE_P(callable)) {
case IS_STRING:
case IS_UNICODE:
- if (object_pp && *object_pp) {
- fcc->object_pp = object_pp;
- fcc->calling_scope = Z_OBJCE_PP(object_pp);
+ if (object_ptr) {
+ fcc->object_ptr = object_ptr;
+ fcc->calling_scope = Z_OBJCE_P(object_ptr);
if (callable_name) {
if (UG(unicode)) {
Z_TYPE_P(callable_name) =
IS_UNICODE;
@@ -3183,7 +3183,7 @@
fcc->calling_scope =
Z_OBJCE_PP(obj); /* TBFixed: what if it's overloaded? */
- fcc->object_pp = obj;
+ fcc->object_ptr = *obj;
if (callable_name) {
if (UG(unicode)) {
@@ -3261,7 +3261,7 @@
return 0;
case IS_OBJECT:
- if (Z_OBJ_HANDLER_P(callable, get_closure) &&
Z_OBJ_HANDLER_P(callable, get_closure)(callable, &fcc->calling_scope,
&fcc->function_handler, NULL, &fcc->object_pp TSRMLS_CC) == SUCCESS) {
+ if (Z_OBJ_HANDLER_P(callable, get_closure) &&
Z_OBJ_HANDLER_P(callable, get_closure)(callable, &fcc->calling_scope,
&fcc->function_handler, &fcc->object_ptr TSRMLS_CC) == SUCCESS) {
fcc->called_scope = fcc->calling_scope;
if (callable_name) {
zend_class_entry *ce =
Z_OBJCE_P(callable); /* TBFixed: what if it's overloaded? */
@@ -3340,7 +3340,7 @@
fci->size = sizeof(*fci);
fci->function_table = fcc->calling_scope ?
&fcc->calling_scope->function_table : EG(function_table);
- fci->object_pp = fcc->object_pp;
+ fci->object_ptr = fcc->object_ptr;
fci->function_name = callable;
fci->retval_ptr_ptr = NULL;
fci->param_count = 0;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.h?r1=1.311&r2=1.312&diff_format=u
Index: ZendEngine2/zend_API.h
diff -u ZendEngine2/zend_API.h:1.311 ZendEngine2/zend_API.h:1.312
--- ZendEngine2/zend_API.h:1.311 Mon Nov 17 11:26:18 2008
+++ ZendEngine2/zend_API.h Thu Nov 27 19:02:44 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.h,v 1.311 2008/11/17 11:26:18 felipe Exp $ */
+/* $Id: zend_API.h,v 1.312 2008/11/27 19:02:44 dmitry Exp $ */
#ifndef ZEND_API_H
#define ZEND_API_H
@@ -48,7 +48,7 @@
zval **retval_ptr_ptr;
zend_uint param_count;
zval ***params;
- zval **object_pp;
+ zval *object_ptr;
zend_bool no_separation;
} zend_fcall_info;
@@ -57,7 +57,7 @@
zend_function *function_handler;
zend_class_entry *calling_scope;
zend_class_entry *called_scope;
- zval **object_pp;
+ zval *object_ptr;
} zend_fcall_info_cache;
#define ZEND_NS_NAME(ns, name) ns"::"name
@@ -284,7 +284,7 @@
#define IS_CALLABLE_STRICT (IS_CALLABLE_CHECK_IS_STATIC)
-ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval **object_pp, uint
check_flags, zval *callable_name, zend_fcall_info_cache *fcc, char **error
TSRMLS_DC);
+ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint
check_flags, zval *callable_name, zend_fcall_info_cache *fcc, char **error
TSRMLS_DC);
ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, zval
*callable_name TSRMLS_DC);
ZEND_API zend_bool zend_make_callable(zval *callable, zval *callable_name
TSRMLS_DC);
ZEND_API const char *zend_get_module_version(const char *module_name);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_closures.c?r1=1.14&r2=1.15&diff_format=u
Index: ZendEngine2/zend_closures.c
diff -u ZendEngine2/zend_closures.c:1.14 ZendEngine2/zend_closures.c:1.15
--- ZendEngine2/zend_closures.c:1.14 Wed Sep 17 13:10:08 2008
+++ ZendEngine2/zend_closures.c Thu Nov 27 19:02:44 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_closures.c,v 1.14 2008/09/17 13:10:08 dmitry Exp $ */
+/* $Id: zend_closures.c,v 1.15 2008/11/27 19:02:44 dmitry Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -213,7 +213,7 @@
}
/* }}} */
-int zend_closure_get_closure(zval *obj, zend_class_entry **ce_ptr,
zend_function **fptr_ptr, zval **zobj_ptr, zval ***zobj_ptr_ptr TSRMLS_DC) /*
{{{ */
+int zend_closure_get_closure(zval *obj, zend_class_entry **ce_ptr,
zend_function **fptr_ptr, zval **zobj_ptr TSRMLS_DC) /* {{{ */
{
zend_closure *closure;
@@ -228,17 +228,11 @@
if (zobj_ptr) {
*zobj_ptr = closure->this_ptr;
}
- if (zobj_ptr_ptr) {
- *zobj_ptr_ptr = &closure->this_ptr;
- }
*ce_ptr = Z_OBJCE_P(closure->this_ptr);
} else {
if (zobj_ptr) {
*zobj_ptr = NULL;
}
- if (zobj_ptr_ptr) {
- *zobj_ptr_ptr = NULL;
- }
*ce_ptr = closure->func.common.scope;
}
return SUCCESS;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_closures.h?r1=1.2&r2=1.3&diff_format=u
Index: ZendEngine2/zend_closures.h
diff -u ZendEngine2/zend_closures.h:1.2 ZendEngine2/zend_closures.h:1.3
--- ZendEngine2/zend_closures.h:1.2 Mon Aug 11 08:49:14 2008
+++ ZendEngine2/zend_closures.h Thu Nov 27 19:02:44 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_closures.h,v 1.2 2008/08/11 08:49:14 dmitry Exp $ */
+/* $Id: zend_closures.h,v 1.3 2008/11/27 19:02:44 dmitry Exp $ */
#ifndef ZEND_CLOSURES_H
#define ZEND_CLOSURES_H
@@ -31,7 +31,7 @@
extern ZEND_API zend_class_entry *zend_ce_closure;
ZEND_API void zend_create_closure(zval *res, zend_function *op_array,
zend_class_entry *scope, zval *this_ptr TSRMLS_DC);
-ZEND_API int zend_get_closure(zval *obj, zend_class_entry **ce_ptr,
zend_function **fptr_ptr, zval **zobj_ptr, zval ***zobj_ptr_ptr TSRMLS_DC);
+ZEND_API int zend_get_closure(zval *obj, zend_class_entry **ce_ptr,
zend_function **fptr_ptr, zval **zobj_ptr TSRMLS_DC);
ZEND_API zend_function *zend_get_closure_invoke_method(zval *obj TSRMLS_DC);
END_EXTERN_C()
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_exceptions.c?r1=1.129&r2=1.130&diff_format=u
Index: ZendEngine2/zend_exceptions.c
diff -u ZendEngine2/zend_exceptions.c:1.129 ZendEngine2/zend_exceptions.c:1.130
--- ZendEngine2/zend_exceptions.c:1.129 Mon Nov 17 11:26:18 2008
+++ ZendEngine2/zend_exceptions.c Thu Nov 27 19:02:44 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_exceptions.c,v 1.129 2008/11/17 11:26:18 felipe Exp $ */
+/* $Id: zend_exceptions.c,v 1.130 2008/11/27 19:02:44 dmitry Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -629,7 +629,7 @@
fci.function_table = &Z_OBJCE_P(getThis())->function_table;
fci.function_name = &fname;
fci.symbol_table = NULL;
- fci.object_pp = &exception;
+ fci.object_ptr = exception;
fci.retval_ptr_ptr = &trace;
fci.param_count = 0;
fci.params = NULL;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.467&r2=1.468&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.467
ZendEngine2/zend_execute_API.c:1.468
--- ZendEngine2/zend_execute_API.c:1.467 Wed Nov 19 01:59:06 2008
+++ ZendEngine2/zend_execute_API.c Thu Nov 27 19:02:44 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute_API.c,v 1.467 2008/11/19 01:59:06 colder Exp $ */
+/* $Id: zend_execute_API.c,v 1.468 2008/11/27 19:02:44 dmitry Exp $ */
#include <stdio.h>
#include <signal.h>
@@ -726,7 +726,7 @@
fci.size = sizeof(fci);
fci.function_table = function_table;
- fci.object_pp = object_pp;
+ fci.object_ptr = object_pp ? *object_pp : NULL;
fci.function_name = function_name;
fci.retval_ptr_ptr = retval_ptr_ptr;
fci.param_count = param_count;
@@ -794,7 +794,7 @@
fci_cache = &fci_cache_local;
}
- if (!zend_is_callable_ex(fci->function_name, fci->object_pp,
IS_CALLABLE_CHECK_SILENT, &callable_name, fci_cache, &error TSRMLS_CC)) {
+ if (!zend_is_callable_ex(fci->function_name, fci->object_ptr,
IS_CALLABLE_CHECK_SILENT, &callable_name, fci_cache, &error TSRMLS_CC)) {
if (error) {
zend_error(E_WARNING, "Invalid callback %Z,
%s", callable_name, error);
efree(error);
@@ -815,10 +815,10 @@
EX(function_state).function = fci_cache->function_handler;
calling_scope = fci_cache->calling_scope;
called_scope = fci_cache->called_scope;
- fci->object_pp = fci_cache->object_pp;
- EX(object) = fci->object_pp ? *fci->object_pp : NULL;
- if (fci->object_pp && *fci->object_pp && Z_TYPE_PP(fci->object_pp) ==
IS_OBJECT
- && (!EG(objects_store).object_buckets ||
!EG(objects_store).object_buckets[Z_OBJ_HANDLE_PP(fci->object_pp)].valid)) {
+ fci->object_ptr = fci_cache->object_ptr;
+ EX(object) = fci->object_ptr;
+ if (fci->object_ptr && Z_TYPE_P(fci->object_ptr) == IS_OBJECT
+ && (!EG(objects_store).object_buckets ||
!EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(fci->object_ptr)].valid)) {
return FAILURE;
}
@@ -899,11 +899,11 @@
EG(called_scope) = NULL;
}
- if (fci->object_pp) {
+ if (fci->object_ptr) {
if ((EX(function_state).function->common.fn_flags &
ZEND_ACC_STATIC)) {
EG(This) = NULL;
} else {
- EG(This) = *fci->object_pp;
+ EG(This) = fci->object_ptr;
if (!PZVAL_IS_REF(EG(This))) {
Z_ADDREF_P(EG(This)); /* For $this pointer */
@@ -960,7 +960,7 @@
if (EX(function_state).function->common.scope) {
EG(scope) = EX(function_state).function->common.scope;
}
- ((zend_internal_function *)
EX(function_state).function)->handler(fci->param_count, *fci->retval_ptr_ptr,
fci->retval_ptr_ptr, (fci->object_pp?*fci->object_pp:NULL), 1 TSRMLS_CC);
+ ((zend_internal_function *)
EX(function_state).function)->handler(fci->param_count, *fci->retval_ptr_ptr,
fci->retval_ptr_ptr, fci->object_ptr, 1 TSRMLS_CC);
/* We shouldn't fix bad extensions here,
because it can break proper ones (Bug #34045)
if (!EX(function_state).function->common.return_reference)
@@ -980,8 +980,8 @@
ALLOC_INIT_ZVAL(*fci->retval_ptr_ptr);
/* Not sure what should be done here if it's a static method */
- if (fci->object_pp) {
-
Z_OBJ_HT_PP(fci->object_pp)->call_method(EX(function_state).function->common.function_name,
fci->param_count, *fci->retval_ptr_ptr, fci->retval_ptr_ptr, *fci->object_pp,
1 TSRMLS_CC);
+ if (fci->object_ptr) {
+
Z_OBJ_HT_P(fci->object_ptr)->call_method(EX(function_state).function->common.function_name,
fci->param_count, *fci->retval_ptr_ptr, fci->retval_ptr_ptr, fci->object_ptr,
1 TSRMLS_CC);
} else {
zend_error_noreturn(E_ERROR, "Cannot call overloaded
function for non-object");
}
@@ -1101,14 +1101,14 @@
fcall_info.retval_ptr_ptr = &retval_ptr;
fcall_info.param_count = 1;
fcall_info.params = args;
- fcall_info.object_pp = NULL;
+ fcall_info.object_ptr = NULL;
fcall_info.no_separation = 1;
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;
+ fcall_cache.object_ptr = NULL;
zend_exception_save(TSRMLS_C);
retval = zend_call_function(&fcall_info, &fcall_cache TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_interfaces.c?r1=1.73&r2=1.74&diff_format=u
Index: ZendEngine2/zend_interfaces.c
diff -u ZendEngine2/zend_interfaces.c:1.73 ZendEngine2/zend_interfaces.c:1.74
--- ZendEngine2/zend_interfaces.c:1.73 Mon Nov 17 11:26:18 2008
+++ ZendEngine2/zend_interfaces.c Thu Nov 27 19:02:44 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_interfaces.c,v 1.73 2008/11/17 11:26:18 felipe Exp $ */
+/* $Id: zend_interfaces.c,v 1.74 2008/11/27 19:02:44 dmitry Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -46,7 +46,7 @@
fci.size = sizeof(fci);
/*fci.function_table = NULL; will be read form zend_class_entry of
object if needed */
- fci.object_pp = object_pp;
+ fci.object_ptr = object_pp ? *object_pp : NULL;
fci.function_name = &z_fname;
fci.retval_ptr_ptr = retval_ptr_ptr ? retval_ptr_ptr : &retval;
fci.param_count = param_count;
@@ -86,7 +86,7 @@
}
fcic.calling_scope = obj_ce;
fcic.called_scope = object_pp ? obj_ce : EG(called_scope);
- fcic.object_pp = object_pp;
+ fcic.object_ptr = object_pp ? *object_pp : NULL;
result = zend_call_function(&fci, &fcic TSRMLS_CC);
}
if (result == FAILURE) {
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_object_handlers.c?r1=1.206&r2=1.207&diff_format=u
Index: ZendEngine2/zend_object_handlers.c
diff -u ZendEngine2/zend_object_handlers.c:1.206
ZendEngine2/zend_object_handlers.c:1.207
--- ZendEngine2/zend_object_handlers.c:1.206 Fri Oct 17 10:26:16 2008
+++ ZendEngine2/zend_object_handlers.c Thu Nov 27 19:02:44 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_object_handlers.c,v 1.206 2008/10/17 10:26:16 dmitry Exp $ */
+/* $Id: zend_object_handlers.c,v 1.207 2008/11/27 19:02:44 dmitry Exp $ */
#include "zend.h"
#include "zend_globals.h"
@@ -1318,7 +1318,7 @@
}
/* }}} */
-int zend_std_get_closure(zval *obj, zend_class_entry **ce_ptr, zend_function
**fptr_ptr, zval **zobj_ptr, zval ***zobj_ptr_ptr TSRMLS_DC) /* {{{ */
+int zend_std_get_closure(zval *obj, zend_class_entry **ce_ptr, zend_function
**fptr_ptr, zval **zobj_ptr TSRMLS_DC) /* {{{ */
{
zstr key;
zend_uchar utype = UG(unicode)?IS_UNICODE:IS_STRING;
@@ -1348,16 +1348,10 @@
if (zobj_ptr) {
*zobj_ptr = NULL;
}
- if (zobj_ptr_ptr) {
- *zobj_ptr_ptr = NULL;
- }
} else {
if (zobj_ptr) {
*zobj_ptr = obj;
}
- if (zobj_ptr_ptr) {
- *zobj_ptr_ptr = NULL;
- }
}
if (utype == IS_UNICODE) {
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_object_handlers.h?r1=1.66&r2=1.67&diff_format=u
Index: ZendEngine2/zend_object_handlers.h
diff -u ZendEngine2/zend_object_handlers.h:1.66
ZendEngine2/zend_object_handlers.h:1.67
--- ZendEngine2/zend_object_handlers.h:1.66 Thu Aug 14 21:26:05 2008
+++ ZendEngine2/zend_object_handlers.h Thu Nov 27 19:02:44 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_object_handlers.h,v 1.66 2008/08/14 21:26:05 colder Exp $ */
+/* $Id: zend_object_handlers.h,v 1.67 2008/11/27 19:02:44 dmitry Exp $ */
#ifndef ZEND_OBJECT_HANDLERS_H
#define ZEND_OBJECT_HANDLERS_H
@@ -108,7 +108,7 @@
* Returns FAILURE if the object does not have any sense of overloaded
dimensions */
typedef int (*zend_object_count_elements_t)(zval *object, long *count
TSRMLS_DC);
-typedef int (*zend_object_get_closure_t)(zval *obj, zend_class_entry **ce_ptr,
union _zend_function **fptr_ptr, zval **zobj_ptr, zval ***zobj_ptr_ptr
TSRMLS_DC);
+typedef int (*zend_object_get_closure_t)(zval *obj, zend_class_entry **ce_ptr,
union _zend_function **fptr_ptr, zval **zobj_ptr TSRMLS_DC);
struct _zend_object_handlers {
/* general object functions */
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_def.h?r1=1.248&r2=1.249&diff_format=u
Index: ZendEngine2/zend_vm_def.h
diff -u ZendEngine2/zend_vm_def.h:1.248 ZendEngine2/zend_vm_def.h:1.249
--- ZendEngine2/zend_vm_def.h:1.248 Wed Nov 19 01:59:07 2008
+++ ZendEngine2/zend_vm_def.h Thu Nov 27 19:02:44 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_vm_def.h,v 1.248 2008/11/19 01:59:07 colder Exp $ */
+/* $Id: zend_vm_def.h,v 1.249 2008/11/27 19:02:44 dmitry Exp $ */
/* If you change this file, please regenerate the zend_vm_execute.h and
* zend_vm_opcodes.h files by running:
@@ -2132,7 +2132,7 @@
if (Z_TYPE_P(function_name) == IS_OBJECT &&
Z_OBJ_HANDLER_P(function_name, get_closure) &&
- Z_OBJ_HANDLER_P(function_name,
get_closure)(function_name, &EX(called_scope), &EX(fbc), &EX(object), NULL
TSRMLS_CC) == SUCCESS) {
+ Z_OBJ_HANDLER_P(function_name,
get_closure)(function_name, &EX(called_scope), &EX(fbc), &EX(object) TSRMLS_CC)
== SUCCESS) {
if (EX(object)) {
Z_ADDREF_P(EX(object));
}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_execute.h?r1=1.252&r2=1.253&diff_format=u
Index: ZendEngine2/zend_vm_execute.h
diff -u ZendEngine2/zend_vm_execute.h:1.252 ZendEngine2/zend_vm_execute.h:1.253
--- ZendEngine2/zend_vm_execute.h:1.252 Wed Nov 19 01:59:07 2008
+++ ZendEngine2/zend_vm_execute.h Thu Nov 27 19:02:44 2008
@@ -758,7 +758,7 @@
if (Z_TYPE_P(function_name) == IS_OBJECT &&
Z_OBJ_HANDLER_P(function_name, get_closure) &&
- Z_OBJ_HANDLER_P(function_name,
get_closure)(function_name, &EX(called_scope), &EX(fbc), &EX(object), NULL
TSRMLS_CC) == SUCCESS) {
+ Z_OBJ_HANDLER_P(function_name,
get_closure)(function_name, &EX(called_scope), &EX(fbc), &EX(object) TSRMLS_CC)
== SUCCESS) {
if (EX(object)) {
Z_ADDREF_P(EX(object));
}
@@ -958,7 +958,7 @@
if (Z_TYPE_P(function_name) == IS_OBJECT &&
Z_OBJ_HANDLER_P(function_name, get_closure) &&
- Z_OBJ_HANDLER_P(function_name,
get_closure)(function_name, &EX(called_scope), &EX(fbc), &EX(object), NULL
TSRMLS_CC) == SUCCESS) {
+ Z_OBJ_HANDLER_P(function_name,
get_closure)(function_name, &EX(called_scope), &EX(fbc), &EX(object) TSRMLS_CC)
== SUCCESS) {
if (EX(object)) {
Z_ADDREF_P(EX(object));
}
@@ -1046,7 +1046,7 @@
if (Z_TYPE_P(function_name) == IS_OBJECT &&
Z_OBJ_HANDLER_P(function_name, get_closure) &&
- Z_OBJ_HANDLER_P(function_name,
get_closure)(function_name, &EX(called_scope), &EX(fbc), &EX(object), NULL
TSRMLS_CC) == SUCCESS) {
+ Z_OBJ_HANDLER_P(function_name,
get_closure)(function_name, &EX(called_scope), &EX(fbc), &EX(object) TSRMLS_CC)
== SUCCESS) {
if (EX(object)) {
Z_ADDREF_P(EX(object));
}
@@ -1163,7 +1163,7 @@
if (Z_TYPE_P(function_name) == IS_OBJECT &&
Z_OBJ_HANDLER_P(function_name, get_closure) &&
- Z_OBJ_HANDLER_P(function_name,
get_closure)(function_name, &EX(called_scope), &EX(fbc), &EX(object), NULL
TSRMLS_CC) == SUCCESS) {
+ Z_OBJ_HANDLER_P(function_name,
get_closure)(function_name, &EX(called_scope), &EX(fbc), &EX(object) TSRMLS_CC)
== SUCCESS) {
if (EX(object)) {
Z_ADDREF_P(EX(object));
}
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug46409.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/bug46409.phpt
diff -u /dev/null ZendEngine2/tests/bug46409.phpt:1.2
--- /dev/null Thu Nov 27 19:02:46 2008
+++ ZendEngine2/tests/bug46409.phpt Thu Nov 27 19:02:44 2008
@@ -0,0 +1,25 @@
+--TEST--
+Bug #46409 (__invoke method called outside of object context when using
array_map)
+--FILE--
+<?php
+class Callback {
+ protected $val = 'hello, world';
+
+ public function __invoke() {
+ return $this->val;
+ }
+}
+
+$cb = new Callback();
+echo $cb(),"\n";
+$a = array(1, 2);
+$b = array_map($cb, $a);
+print_r($b);
+?>
+--EXPECT--
+hello, world
+Array
+(
+ [0] => hello, world
+ [1] => hello, world
+)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.134&r2=1.135&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.134 php-src/ext/curl/interface.c:1.135
--- php-src/ext/curl/interface.c:1.134 Thu Nov 27 17:03:22 2008
+++ php-src/ext/curl/interface.c Thu Nov 27 19:02:44 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.134 2008/11/27 17:03:22 iliaa Exp $ */
+/* $Id: interface.c,v 1.135 2008/11/27 19:02:44 dmitry Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -851,7 +851,7 @@
fci.size = sizeof(fci);
fci.function_table = EG(function_table);
- fci.object_pp = NULL;
+ fci.object_ptr = NULL;
fci.function_name = t->func_name;
fci.retval_ptr_ptr = &retval_ptr;
fci.param_count = 2;
@@ -924,7 +924,7 @@
fci.size = sizeof(fci);
fci.function_table = EG(function_table);
fci.function_name = t->func_name;
- fci.object_pp = NULL;
+ fci.object_ptr = NULL;
fci.retval_ptr_ptr = &retval_ptr;
fci.param_count = 3;
fci.params = argv;
@@ -1001,7 +1001,7 @@
fci.function_table = EG(function_table);
fci.function_name = t->func_name;
fci.symbol_table = NULL;
- fci.object_pp = NULL;
+ fci.object_ptr = NULL;
fci.retval_ptr_ptr = &retval_ptr;
fci.param_count = 2;
fci.params = argv;
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/xpath.c?r1=1.44&r2=1.45&diff_format=u
Index: php-src/ext/dom/xpath.c
diff -u php-src/ext/dom/xpath.c:1.44 php-src/ext/dom/xpath.c:1.45
--- php-src/ext/dom/xpath.c:1.44 Wed Nov 19 01:59:07 2008
+++ php-src/ext/dom/xpath.c Thu Nov 27 19:02:44 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xpath.c,v 1.44 2008/11/19 01:59:07 colder Exp $ */
+/* $Id: xpath.c,v 1.45 2008/11/27 19:02:44 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -197,7 +197,7 @@
fci.function_name = &handler;
fci.symbol_table = NULL;
- fci.object_pp = NULL;
+ fci.object_ptr = NULL;
fci.retval_ptr_ptr = &retval;
fci.no_separation = 0;
/*fci.function_handler_cache = &function_ptr;*/
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.268&r2=1.269&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.268 php-src/ext/mysql/php_mysql.c:1.269
--- php-src/ext/mysql/php_mysql.c:1.268 Tue Oct 28 10:45:31 2008
+++ php-src/ext/mysql/php_mysql.c Thu Nov 27 19:02:44 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.268 2008/10/28 10:45:31 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.269 2008/11/27 19:02:44 dmitry Exp $ */
/* TODO:
*
@@ -2200,7 +2200,7 @@
fci.function_table = &ce->function_table;
fci.function_name = NULL;
fci.symbol_table = NULL;
- fci.object_pp = &return_value;
+ fci.object_ptr = return_value;
fci.retval_ptr_ptr = &retval_ptr;
if (ctor_params && Z_TYPE_P(ctor_params) != IS_NULL) {
if (Z_TYPE_P(ctor_params) == IS_ARRAY) {
@@ -2234,7 +2234,7 @@
fcc.function_handler = ce->constructor;
fcc.calling_scope = EG(scope);
fcc.called_scope = Z_OBJCE_P(return_value);
- fcc.object_pp = &return_value;
+ fcc.object_ptr = return_value;
if (zend_call_function(&fci, &fcc TSRMLS_CC) ==
FAILURE) {
zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC,
"Could not execute %v::%v()", ce->name, ce->constructor->common.function_name);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.137&r2=1.138&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.137 php-src/ext/mysqli/mysqli.c:1.138
--- php-src/ext/mysqli/mysqli.c:1.137 Tue Nov 18 16:54:38 2008
+++ php-src/ext/mysqli/mysqli.c Thu Nov 27 19:02:44 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.137 2008/11/18 16:54:38 andrey Exp $
+ $Id: mysqli.c,v 1.138 2008/11/27 19:02:44 dmitry Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1313,7 +1313,7 @@
fci.function_table = &ce->function_table;
fci.function_name = NULL;
fci.symbol_table = NULL;
- fci.object_pp = &return_value;
+ fci.object_ptr = return_value;
fci.retval_ptr_ptr = &retval_ptr;
if (ctor_params && Z_TYPE_P(ctor_params) != IS_NULL) {
if (Z_TYPE_P(ctor_params) == IS_ARRAY) {
@@ -1347,7 +1347,7 @@
fcc.function_handler = ce->constructor;
fcc.calling_scope = EG(scope);
fcc.called_scope = Z_OBJCE_P(return_value);
- fcc.object_pp = &return_value;
+ fcc.object_ptr = return_value;
if (zend_call_function(&fci, &fcc TSRMLS_CC) ==
FAILURE) {
zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC,
"Could not execute %v::%v()", ce->name, ce->constructor->common.function_name);
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.156&r2=1.157&diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.156 php-src/ext/pdo/pdo_dbh.c:1.157
--- php-src/ext/pdo/pdo_dbh.c:1.156 Thu Nov 13 14:36:56 2008
+++ php-src/ext/pdo/pdo_dbh.c Thu Nov 27 19:02:44 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dbh.c,v 1.156 2008/11/13 14:36:56 pajoye Exp $ */
+/* $Id: pdo_dbh.c,v 1.157 2008/11/27 19:02:44 dmitry Exp $ */
/* The PDO Database Handle Class */
@@ -460,7 +460,7 @@
fci.size = sizeof(zend_fcall_info);
fci.function_table = &dbstmt_ce->function_table;
fci.function_name = NULL;
- fci.object_pp = &object;
+ fci.object_ptr = object;
fci.symbol_table = NULL;
fci.retval_ptr_ptr = &retval;
if (ctor_args) {
@@ -484,7 +484,7 @@
fcc.function_handler = dbstmt_ce->constructor;
fcc.calling_scope = EG(scope);
fcc.called_scope = Z_OBJCE_P(object);
- fcc.object_pp = &object;
+ fcc.object_ptr = object;
if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) {
zval_dtor(object);
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.211&r2=1.212&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.211 php-src/ext/pdo/pdo_stmt.c:1.212
--- php-src/ext/pdo/pdo_stmt.c:1.211 Mon Nov 17 11:26:22 2008
+++ php-src/ext/pdo/pdo_stmt.c Thu Nov 27 19:02:44 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.211 2008/11/17 11:26:22 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.212 2008/11/27 19:02:44 dmitry Exp $ */
/* The PDO Statement Handle Class */
@@ -777,7 +777,7 @@
static int make_callable_ex(pdo_stmt_t *stmt, zval *callable, zend_fcall_info
* fci, zend_fcall_info_cache * fcc, int num_args TSRMLS_DC) /* {{{ */
{
- zval **object = NULL, **method = NULL;
+ zval *object = NULL, **method = NULL;
char *fname = NULL, *cname;
zend_class_entry * ce = NULL, **pce;
zend_function *function_handler;
@@ -787,19 +787,19 @@
pdo_raise_impl_error(stmt->dbh, stmt, "HY000",
"user-supplied function must be a valid callback" TSRMLS_CC);
return 0;
}
- object = (zval**)Z_ARRVAL_P(callable)->pListHead->pData;
+ object = *(zval**)Z_ARRVAL_P(callable)->pListHead->pData;
method =
(zval**)Z_ARRVAL_P(callable)->pListHead->pListNext->pData;
- if (Z_TYPE_PP(object) == IS_STRING) { /* static call */
- if (zend_lookup_class(Z_STRVAL_PP(object),
Z_STRLEN_PP(object), &pce TSRMLS_CC) == FAILURE) {
+ if (Z_TYPE_P(object) == IS_STRING) { /* static call */
+ if (zend_lookup_class(Z_STRVAL_P(object),
Z_STRLEN_P(object), &pce TSRMLS_CC) == FAILURE) {
pdo_raise_impl_error(stmt->dbh, stmt, "HY000",
"user-supplied class does not exist" TSRMLS_CC);
return 0;
} else {
ce = *pce;
}
object = NULL;
- } else if (Z_TYPE_PP(object) == IS_OBJECT) { /* object call */
- ce = Z_OBJCE_PP(object);
+ } else if (Z_TYPE_P(object) == IS_OBJECT) { /* object call */
+ ce = Z_OBJCE_P(object);
} else {
pdo_raise_impl_error(stmt->dbh, stmt, "HY000",
"user-supplied function must be a valid callback; bogus object/class name"
TSRMLS_CC);
return 0;
@@ -856,13 +856,13 @@
fci->symbol_table = NULL;
fci->param_count = num_args; /* probably less */
fci->params = safe_emalloc(sizeof(zval**), num_args, 0);
- fci->object_pp = object;
+ fci->object_ptr = object;
fcc->initialized = 1;
fcc->function_handler = function_handler;
fcc->calling_scope = EG(scope);
- fcc->called_scope = object ? Z_OBJCE_PP(object) : NULL;
- fcc->object_pp = object;
+ fcc->called_scope = object ? Z_OBJCE_P(object) : NULL;
+ fcc->object_ptr = object;
return 1;
}
@@ -1035,8 +1035,8 @@
}
}
if (ce->constructor && (flags &
PDO_FETCH_PROPS_LATE)) {
- stmt->fetch.cls.fci.object_pp =
&return_value;
- stmt->fetch.cls.fcc.object_pp =
&return_value;
+ stmt->fetch.cls.fci.object_ptr
= return_value;
+ stmt->fetch.cls.fcc.object_ptr
= return_value;
if
(zend_call_function(&stmt->fetch.cls.fci, &stmt->fetch.cls.fcc TSRMLS_CC) ==
FAILURE) {
pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "could not call class
constructor" TSRMLS_CC);
return 0;
@@ -1240,8 +1240,8 @@
switch (how) {
case PDO_FETCH_CLASS:
if (ce->constructor && !(flags &
PDO_FETCH_PROPS_LATE)) {
- stmt->fetch.cls.fci.object_pp =
&return_value;
- stmt->fetch.cls.fcc.object_pp =
&return_value;
+ stmt->fetch.cls.fci.object_ptr =
return_value;
+ stmt->fetch.cls.fcc.object_ptr =
return_value;
if
(zend_call_function(&stmt->fetch.cls.fci, &stmt->fetch.cls.fcc TSRMLS_CC) ==
FAILURE) {
pdo_raise_impl_error(stmt->dbh,
stmt, "HY000", "could not call class constructor" TSRMLS_CC);
return 0;
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_driver.c?r1=1.36&r2=1.37&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_driver.c
diff -u php-src/ext/pdo_sqlite/sqlite_driver.c:1.36
php-src/ext/pdo_sqlite/sqlite_driver.c:1.37
--- php-src/ext/pdo_sqlite/sqlite_driver.c:1.36 Sat Aug 2 04:40:44 2008
+++ php-src/ext/pdo_sqlite/sqlite_driver.c Thu Nov 27 19:02:45 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sqlite_driver.c,v 1.36 2008/08/02 04:40:44 felipe Exp $ */
+/* $Id: sqlite_driver.c,v 1.37 2008/11/27 19:02:45 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -332,7 +332,7 @@
fc->fci.function_table = EG(function_table);
fc->fci.function_name = cb;
fc->fci.symbol_table = NULL;
- fc->fci.object_pp = NULL;
+ fc->fci.object_ptr = NULL;
fc->fci.retval_ptr_ptr = &retval;
fc->fci.param_count = fake_argc;
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.394&r2=1.395&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.394 php-src/ext/pgsql/pgsql.c:1.395
--- php-src/ext/pgsql/pgsql.c:1.394 Mon Nov 17 11:26:22 2008
+++ php-src/ext/pgsql/pgsql.c Thu Nov 27 19:02:45 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.394 2008/11/17 11:26:22 felipe Exp $ */
+/* $Id: pgsql.c,v 1.395 2008/11/27 19:02:45 dmitry Exp $ */
#include <stdlib.h>
@@ -2515,7 +2515,7 @@
fci.function_table = &ce->function_table;
fci.function_name = NULL;
fci.symbol_table = NULL;
- fci.object_pp = &return_value;
+ fci.object_ptr = return_value;
fci.retval_ptr_ptr = &retval_ptr;
if (ctor_params && Z_TYPE_P(ctor_params) != IS_NULL) {
if (Z_TYPE_P(ctor_params) == IS_ARRAY) {
@@ -2549,7 +2549,7 @@
fcc.function_handler = ce->constructor;
fcc.calling_scope = EG(scope);
fcc.called_scope = Z_OBJCE_P(return_value);
- fcc.object_pp = &return_value;
+ fcc.object_ptr = return_value;
if (zend_call_function(&fci, &fcc TSRMLS_CC) ==
FAILURE) {
zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC,
"Could not execute %s::%s()", ce->name, ce->constructor->common.function_name);
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.326&r2=1.327&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.326
php-src/ext/reflection/php_reflection.c:1.327
--- php-src/ext/reflection/php_reflection.c:1.326 Fri Nov 21 23:32:50 2008
+++ php-src/ext/reflection/php_reflection.c Thu Nov 27 19:02:45 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.326 2008/11/21 23:32:50 felipe Exp $ */
+/* $Id: php_reflection.c,v 1.327 2008/11/27 19:02:45 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1302,7 +1302,7 @@
fci.function_table = NULL;
fci.function_name = NULL;
fci.symbol_table = NULL;
- fci.object_pp = &reflector_ptr;
+ fci.object_ptr = reflector_ptr;
fci.retval_ptr_ptr = &retval_ptr;
fci.param_count = ctor_argc;
fci.params = params;
@@ -1312,7 +1312,7 @@
fcc.function_handler = ce_ptr->constructor;
fcc.calling_scope = ce_ptr;
fcc.called_scope = Z_OBJCE_P(reflector_ptr);
- fcc.object_pp = &reflector_ptr;
+ fcc.object_ptr = reflector_ptr;
result = zend_call_function(&fci, &fcc TSRMLS_CC);
@@ -1337,7 +1337,7 @@
ZVAL_ASCII_STRINGL(&fname, "reflection::export",
sizeof("reflection::export") - 1, 1);
fci.function_table = &reflection_ptr->function_table;
fci.function_name = &fname;
- fci.object_pp = NULL;
+ fci.object_ptr = NULL;
fci.retval_ptr_ptr = &retval_ptr;
fci.param_count = 2;
fci.params = params;
@@ -1684,7 +1684,7 @@
fci.function_table = NULL;
fci.function_name = NULL;
fci.symbol_table = NULL;
- fci.object_pp = NULL;
+ fci.object_ptr = NULL;
fci.retval_ptr_ptr = &retval_ptr;
fci.param_count = num_args;
fci.params = params;
@@ -1694,7 +1694,7 @@
fcc.function_handler = fptr;
fcc.calling_scope = EG(scope);
fcc.called_scope = NULL;
- fcc.object_pp = NULL;
+ fcc.object_ptr = NULL;
result = zend_call_function(&fci, &fcc TSRMLS_CC);
@@ -1749,7 +1749,7 @@
fci.function_table = NULL;
fci.function_name = NULL;
fci.symbol_table = NULL;
- fci.object_pp = NULL;
+ fci.object_ptr = NULL;
fci.retval_ptr_ptr = &retval_ptr;
fci.param_count = argc;
fci.params = params;
@@ -1759,7 +1759,7 @@
fcc.function_handler = fptr;
fcc.calling_scope = EG(scope);
fcc.called_scope = NULL;
- fcc.object_pp = NULL;
+ fcc.object_ptr = NULL;
result = zend_call_function(&fci, &fcc TSRMLS_CC);
@@ -2514,7 +2514,7 @@
{
zval *retval_ptr;
zval ***params = NULL;
- zval **object_pp;
+ zval *object_ptr;
reflection_object *intern;
zend_function *mptr;
int result, num_args = 0;
@@ -2547,14 +2547,14 @@
return;
}
- /* In case this is a static method, we should'nt pass an object_pp
+ /* In case this is a static method, we should'nt pass an object_ptr
* (which is used as calling context aka $this). We can thus ignore the
* first parameter.
*
* Else, we verify that the given object is an instance of the class.
*/
if (mptr->common.fn_flags & ZEND_ACC_STATIC) {
- object_pp = NULL;
+ object_ptr = NULL;
obj_ce = mptr->common.scope;
} else {
if ((Z_TYPE_PP(params[0]) != IS_OBJECT)) {
@@ -2570,14 +2570,14 @@
/* Returns from this function */
}
- object_pp = params[0];
+ object_ptr = *params[0];
}
fci.size = sizeof(fci);
fci.function_table = NULL;
fci.function_name = NULL;
fci.symbol_table = NULL;
- fci.object_pp = object_pp;
+ fci.object_ptr = object_ptr;
fci.retval_ptr_ptr = &retval_ptr;
fci.param_count = num_args-1;
fci.params = params+1;
@@ -2587,7 +2587,7 @@
fcc.function_handler = mptr;
fcc.calling_scope = obj_ce;
fcc.called_scope = obj_ce;
- fcc.object_pp = object_pp;
+ fcc.object_ptr = object_ptr;
result = zend_call_function(&fci, &fcc TSRMLS_CC);
@@ -2652,7 +2652,7 @@
zend_hash_apply_with_argument(Z_ARRVAL_P(param_array),
(apply_func_arg_t)_zval_array_to_c_array, ¶ms TSRMLS_CC);
params -= argc;
- /* In case this is a static method, we should'nt pass an object_pp
+ /* In case this is a static method, we should'nt pass an object_ptr
* (which is used as calling context aka $this). We can thus ignore the
* first parameter.
*
@@ -2683,7 +2683,7 @@
fci.function_table = NULL;
fci.function_name = NULL;
fci.symbol_table = NULL;
- fci.object_pp = &object;
+ fci.object_ptr = object;
fci.retval_ptr_ptr = &retval_ptr;
fci.param_count = argc;
fci.params = params;
@@ -2693,7 +2693,7 @@
fcc.function_handler = mptr;
fcc.calling_scope = obj_ce;
fcc.called_scope = obj_ce;
- fcc.object_pp = object ? &object : NULL;
+ fcc.object_ptr = object;
result = zend_call_function(&fci, &fcc TSRMLS_CC);
@@ -3819,7 +3819,7 @@
fci.function_table = EG(function_table);
fci.function_name = NULL;
fci.symbol_table = NULL;
- fci.object_pp = &return_value;
+ fci.object_ptr = return_value;
fci.retval_ptr_ptr = &retval_ptr;
fci.param_count = num_args;
fci.params = params;
@@ -3829,7 +3829,7 @@
fcc.function_handler = ce->constructor;
fcc.calling_scope = EG(scope);
fcc.called_scope = Z_OBJCE_P(return_value);
- fcc.object_pp = &return_value;
+ fcc.object_ptr = return_value;
if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) {
efree(params);
@@ -3898,7 +3898,7 @@
fci.function_table = EG(function_table);
fci.function_name = NULL;
fci.symbol_table = NULL;
- fci.object_pp = &return_value;
+ fci.object_ptr = return_value;
fci.retval_ptr_ptr = &retval_ptr;
fci.param_count = argc;
fci.params = params;
@@ -3908,7 +3908,7 @@
fcc.function_handler = ce->constructor;
fcc.calling_scope = EG(scope);
fcc.called_scope = Z_OBJCE_P(return_value);
- fcc.object_pp = &return_value;
+ fcc.object_ptr = return_value;
if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) {
if (params) {
@@ -5433,7 +5433,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.326
2008/11/21 23:32:50 felipe Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.327
2008/11/27 19:02:45 dmitry Exp $");
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.256&r2=1.257&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.256 php-src/ext/soap/soap.c:1.257
--- php-src/ext/soap/soap.c:1.256 Thu Nov 27 11:25:52 2008
+++ php-src/ext/soap/soap.c Thu Nov 27 19:02:45 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.256 2008/11/27 11:25:52 dmitry Exp $ */
+/* $Id: soap.c,v 1.257 2008/11/27 19:02:45 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1283,7 +1283,7 @@
fci.function_table = &Z_OBJCE_P(getThis())->function_table;
fci.function_name = &fname;
fci.symbol_table = NULL;
- fci.object_pp = &getThis();
+ fci.object_ptr = getThis();
fci.retval_ptr_ptr = &trace;
fci.param_count = 0;
fci.params = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.145&r2=1.146&diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.145 php-src/ext/spl/php_spl.c:1.146
--- php-src/ext/spl/php_spl.c:1.145 Mon Nov 17 11:26:23 2008
+++ php-src/ext/spl/php_spl.c Thu Nov 27 19:02:45 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_spl.c,v 1.145 2008/11/17 11:26:23 felipe Exp $ */
+/* $Id: php_spl.c,v 1.146 2008/11/27 19:02:45 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -415,7 +415,7 @@
zend_bool prepend = 0;
zend_function *spl_func_ptr;
autoload_func_info alfi;
- zval **obj_ptr;
+ zval *obj_ptr;
zend_fcall_info_cache fcc;
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, "|zbb", &zcallable, &do_throw, &prepend) == FAILURE) {
@@ -449,7 +449,7 @@
if (!zend_is_callable_ex(zcallable, NULL, IS_CALLABLE_STRICT,
&zfunc_name, &fcc, &error TSRMLS_CC)) {
alfi.ce = fcc.calling_scope;
alfi.func_ptr = fcc.function_handler;
- obj_ptr = fcc.object_pp;
+ obj_ptr = fcc.object_ptr;
if (Z_TYPE_P(zcallable) == IS_ARRAY) {
if (!obj_ptr && alfi.func_ptr &&
!(alfi.func_ptr->common.fn_flags & ZEND_ACC_STATIC)) {
if (do_throw) {
@@ -491,7 +491,7 @@
}
alfi.ce = fcc.calling_scope;
alfi.func_ptr = fcc.function_handler;
- obj_ptr = fcc.object_pp;
+ obj_ptr = fcc.object_ptr;
if (error) {
efree(error);
}
@@ -506,9 +506,9 @@
zstr lc_name;
size_t func_name_len = Z_UNISIZE(zfunc_name);
lc_name.v = Z_UNIVAL(zfunc_name).v =
erealloc(Z_UNIVAL(zfunc_name).v, func_name_len + 2 +
sizeof(zend_object_handle));
- memcpy(lc_name.s + func_name_len,
&Z_OBJ_HANDLE_PP(obj_ptr), sizeof(zend_object_handle));
+ memcpy(lc_name.s + func_name_len,
&Z_OBJ_HANDLE_P(obj_ptr), sizeof(zend_object_handle));
func_name_len += sizeof(zend_object_handle);
- alfi.obj = *obj_ptr;
+ alfi.obj = obj_ptr;
Z_ADDREF_P(alfi.obj);
if (Z_TYPE(zfunc_name) == IS_UNICODE) {
func_name_len /= sizeof(UChar);
@@ -569,7 +569,7 @@
zstr lc_name;
int success = FAILURE;
zend_function *spl_func_ptr;
- zval **obj_ptr;
+ zval *obj_ptr;
zend_fcall_info_cache fcc;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zcallable)
== FAILURE) {
@@ -584,7 +584,7 @@
zval_dtor(&zfunc_name);
RETURN_FALSE;
}
- obj_ptr = fcc.object_pp;
+ obj_ptr = fcc.object_ptr;
if (error) {
efree(error);
}
@@ -606,7 +606,7 @@
if (success != SUCCESS && obj_ptr) {
size_t func_name_len = Z_UNISIZE(zfunc_name);
lc_name.v = erealloc(lc_name.v, func_name_len +
2 + sizeof(zend_object_handle));
- memcpy(lc_name.s + func_name_len,
&Z_OBJ_HANDLE_PP(obj_ptr), sizeof(zend_object_handle));
+ memcpy(lc_name.s + func_name_len,
&Z_OBJ_HANDLE_P(obj_ptr), sizeof(zend_object_handle));
func_name_len += sizeof(zend_object_handle);
if (Z_TYPE(zfunc_name) == IS_UNICODE) {
func_name_len /= sizeof(UChar);
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.174&r2=1.175&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.174
php-src/ext/spl/spl_directory.c:1.175
--- php-src/ext/spl/spl_directory.c:1.174 Wed Nov 19 01:59:07 2008
+++ php-src/ext/spl/spl_directory.c Thu Nov 27 19:02:45 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.174 2008/11/19 01:59:07 colder Exp $ */
+/* $Id: spl_directory.c,v 1.175 2008/11/27 19:02:45 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1948,7 +1948,7 @@
fci.size = sizeof(fci);
fci.function_table = EG(function_table);
- fci.object_pp = NULL;
+ fci.object_ptr = NULL;
fci.function_name = &z_fname;
fci.retval_ptr_ptr = &retval;
fci.param_count = num_args;
@@ -1960,7 +1960,7 @@
fcic.function_handler = func_ptr;
fcic.calling_scope = NULL;
fcic.called_scope = NULL;
- fcic.object_pp = NULL;
+ fcic.object_ptr = NULL;
result = zend_call_function(&fci, &fcic TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.219&r2=1.220&diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.219 php-src/ext/sqlite/sqlite.c:1.220
--- php-src/ext/sqlite/sqlite.c:1.219 Sat Nov 22 11:48:38 2008
+++ php-src/ext/sqlite/sqlite.c Thu Nov 27 19:02:45 2008
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.219 2008/11/22 11:48:38 scottmac Exp $
+ $Id: sqlite.c,v 1.220 2008/11/27 19:02:45 dmitry Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1550,7 +1550,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.219 2008/11/22 11:48:38 scottmac
Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.220 2008/11/27 19:02:45 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();
@@ -2619,7 +2619,7 @@
fci.function_table = &ce->function_table;
fci.function_name = NULL;
fci.symbol_table = NULL;
- fci.object_pp = &return_value;
+ fci.object_ptr = return_value;
fci.retval_ptr_ptr = &retval_ptr;
if (ctor_params && Z_TYPE_P(ctor_params) != IS_NULL) {
if (Z_TYPE_P(ctor_params) == IS_ARRAY) {
@@ -2653,7 +2653,7 @@
fcc.function_handler = ce->constructor;
fcc.calling_scope = EG(scope);
fcc.called_scope = Z_OBJCE_P(return_value);
- fcc.object_pp = &return_value;
+ fcc.object_ptr = return_value;
if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) {
zend_throw_exception_ex(sqlite_ce_exception, 0
TSRMLS_CC, "Could not execute %s::%v()", class_name,
ce->constructor->common.function_name);
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.21&r2=1.22&diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.21 php-src/ext/sqlite3/sqlite3.c:1.22
--- php-src/ext/sqlite3/sqlite3.c:1.21 Thu Nov 20 10:20:37 2008
+++ php-src/ext/sqlite3/sqlite3.c Thu Nov 27 19:02:45 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sqlite3.c,v 1.21 2008/11/20 10:20:37 pajoye Exp $ */
+/* $Id: sqlite3.c,v 1.22 2008/11/27 19:02:45 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -631,7 +631,7 @@
fc->fci.function_table = EG(function_table);
fc->fci.function_name = cb;
fc->fci.symbol_table = NULL;
- fc->fci.object_pp = NULL;
+ fc->fci.object_ptr = NULL;
fc->fci.retval_ptr_ptr = &retval;
fc->fci.param_count = fake_argc;
http://cvs.php.net/viewvc.cgi/php-src/ext/xml/xml.c?r1=1.184&r2=1.185&diff_format=u
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.184 php-src/ext/xml/xml.c:1.185
--- php-src/ext/xml/xml.c:1.184 Mon Nov 17 11:26:24 2008
+++ php-src/ext/xml/xml.c Thu Nov 27 19:02:45 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml.c,v 1.184 2008/11/17 11:26:24 felipe Exp $ */
+/* $Id: xml.c,v 1.185 2008/11/27 19:02:45 dmitry Exp $ */
#define IS_EXT_MODULE
@@ -528,7 +528,7 @@
fci.function_table = EG(function_table);
fci.function_name = handler;
fci.symbol_table = NULL;
- fci.object_pp = &parser->object;
+ fci.object_ptr = parser->object;
fci.retval_ptr_ptr = &retval;
fci.param_count = argc;
fci.params = args;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.69&r2=1.70&diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.69
php-src/ext/xsl/xsltprocessor.c:1.70
--- php-src/ext/xsl/xsltprocessor.c:1.69 Mon Nov 17 11:26:25 2008
+++ php-src/ext/xsl/xsltprocessor.c Thu Nov 27 19:02:45 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xsltprocessor.c,v 1.69 2008/11/17 11:26:25 felipe Exp $ */
+/* $Id: xsltprocessor.c,v 1.70 2008/11/27 19:02:45 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -307,7 +307,7 @@
fci.function_name = &handler;
fci.symbol_table = NULL;
- fci.object_pp = NULL;
+ fci.object_ptr = NULL;
fci.retval_ptr_ptr = &retval;
fci.no_separation = 0;
/*fci.function_handler_cache = &function_ptr;*/
http://cvs.php.net/viewvc.cgi/php-src/main/streams/userspace.c?r1=1.50&r2=1.51&diff_format=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.50
php-src/main/streams/userspace.c:1.51
--- php-src/main/streams/userspace.c:1.50 Wed Nov 26 04:18:24 2008
+++ php-src/main/streams/userspace.c Thu Nov 27 19:02:45 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: userspace.c,v 1.50 2008/11/26 04:18:24 lbarnaud Exp $ */
+/* $Id: userspace.c,v 1.51 2008/11/27 19:02:45 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -299,7 +299,7 @@
fci.function_table = &uwrap->ce->function_table;
fci.function_name = NULL;
fci.symbol_table = NULL;
- fci.object_pp = &us->object;
+ fci.object_ptr = us->object;
fci.retval_ptr_ptr = &retval_ptr;
fci.param_count = 0;
fci.params = NULL;
@@ -309,7 +309,7 @@
fcc.function_handler = uwrap->ce->constructor;
fcc.calling_scope = EG(scope);
fcc.called_scope = Z_OBJCE_P(us->object);
- fcc.object_pp = &us->object;
+ fcc.object_ptr = us->object;
if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not
execute %s::%s()", uwrap->ce->name,
uwrap->ce->constructor->common.function_name);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
