cvs: php-src /main/streams userspace.c

tony2001 Mon Aug 14 15:00:05 2006 UTC Modified files: /php-src/main/streams userspace.c Log: fix #38450 (constructor is not called for classes used in userspace stream wrappers) http://cvs.php.net/viewvc.cgi/php-src/main/streams/userspace.c?r1=1.34&r2=1.35&diff_format=u Index: php-src/main/streams/userspace.c diff -u php-src/main/streams/userspace.c:1.34 php-src/main/streams/userspace.c:1.35 --- php-src/main/streams/userspace.c:1.34 Sat Apr 22 23:49:39 2006 +++ php-src/main/streams/userspace.c Mon Aug 14 15:00:04 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: userspace.c,v 1.34 2006/04/22 23:49:39 tony2001 Exp $ */ +/* $Id: userspace.c,v 1.35 2006/08/14 15:00:04 tony2001 Exp $ */ #include "php.h" #include "php_globals.h" @@ -231,6 +231,40 @@ object_init_ex(us->object, uwrap->ce); ZVAL_REFCOUNT(us->object) = 1; PZVAL_IS_REF(us->object) = 1; + + if (uwrap->ce->constructor) { + zend_fcall_info fci; + zend_fcall_info_cache fcc; + zval *retval_ptr; + + fci.size = sizeof(fci); + fci.function_table = &uwrap->ce->function_table; + fci.function_name = NULL; + fci.symbol_table = NULL; + fci.object_pp = &us->object; + fci.retval_ptr_ptr = &retval_ptr; + fci.param_count = 0; + fci.params = NULL; + fci.no_separation = 1; + + fcc.initialized = 1; + fcc.function_handler = uwrap->ce->constructor; + fcc.calling_scope = EG(scope); + fcc.object_pp = &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); + zval_dtor(us->object); + FREE_ZVAL(us->object); + efree(us); + FG(user_stream_current_filename) = NULL; + return NULL; + } else { + if (retval_ptr) { + zval_ptr_dtor(&retval_ptr); + } + } + } if (context) { MAKE_STD_ZVAL(zcontext);