Re: cvs: php-src(PHP_5_1) / NEWS /ext/pdo pdo_stmt.c

This isn't really a true clone of the statement. I'm not sure if we want it to work this way; I'd rather throw an exception here and just say that you need to not be using ze1 compat mode. Thoughts? --Wez. On 1/1/06, Ilia Alshanetsky <iliaa@php.net> wrote: > iliaa Sun Jan 1 20:07:41 2006 UTC > > Modified files: (Branch: PHP_5_1) > /php-src NEWS > /php-src/ext/pdo pdo_stmt.c > Log: > Fixed bug #35797 (segfault on PDOStatement::execute() with > zend.ze1_compatibility_mode = On). > > > > http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.333&r2=1.2027..2.334&diff_format=u > Index: php-src/NEWS > diff -u php-src/NEWS:1.2027.2.333 php-src/NEWS:1.2027.2.334 > --- php-src/NEWS:1.2027.2.333 Sat Dec 31 00:57:29 2005 > +++ php-src/NEWS Sun Jan 1 20:07:41 2006 > @@ -11,6 +11,8 @@ > the callback). (Tony) > - Fixed bug #35817 (unpack() does not decode odd number of hexadecimal values). > (Ilia) > +- Fixed bug #35797 (segfault on PDOStatement::execute() with > + zend.ze1_compatibility_mode = On). (Tony, Ilia) > - Fixed bug #35781 (stream_filter_append() can cause segfault). (Tony) > - Fixed bug #35759 (mysqli_stmt_bind_result() makes huge allocation when > column empty). (Andrey) > ^D,��4 > ����"B�__http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.29&r2=1.118.2.30&diff_format=u > Index: php-src/ext/pdo/pdo_stmt.c > diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.29 php-src/ext/pdo/pdo_stmt.c:1.118.2.30 > --- php-src/ext/pdo/pdo_stmt.c:1.118.2.29 Sun Jan 1 12:50:11 2006 > +++ php-src/ext/pdo/pdo_stmt.c Sun Jan 1 20:07:41 2006 > @@ -18,7 +18,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: pdo_stmt.c,v 1.118.2.29 2006/01/01 12:50:11 sniper Exp $ */ > +/* $Id: pdo_stmt.c,v 1.118.2.30 2006/01/01 20:07:41 iliaa Exp $ */ > > /* The PDO Statement Handle Class */ > > @@ -2060,6 +2060,34 @@ > return -1; > } > > +static zend_object_value dbstmt_clone_obj(zval *zobject TSRMLS_DC) > +{ > + zend_object_value retval; > + zval *tmp; > + pdo_stmt_t *stmt; > + pdo_stmt_t *old_stmt; > + zend_object_handle handle = Z_OBJ_HANDLE_P(zobject); > + > + stmt = ecalloc(1, sizeof(*stmt)); > + stmt->ce = Z_OBJCE_P(zobject); > + stmt->refcount = 1; > + ALLOC_HASHTABLE(stmt->properties); > + zend_hash_init(stmt->properties, 0, NULL, ZVAL_PTR_DTOR, 0); > + zend_hash_copy(stmt->properties, &stmt->ce->default_properties, > (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); > + > + old_stmt = (pdo_stmt_t *)zend_object_store_get_object(zobject TSRMLS_CC); > + > + retval.handle = zend_objects_store_put(stmt, > (zend_objects_store_dtor_t)zend_objects_destroy_object, > (zend_objects_free_object_storage_t)pdo_dbstmt_free_storage, > (zend_objects_store_clone_t)dbstmt_clone_obj TSRMLS_CC); > + retval.handlers = Z_OBJ_HT_P(zobject); > + > + zend_objects_clone_members((zend_object *)stmt, retval, (zend_object *)old_stmt, handle > TSRMLS_CC); > + > + zend_objects_store_add_ref(&old_stmt->database_object_handle TSRMLS_CC); > + stmt->database_object_handle = old_stmt->database_object_handle; > + > + return retval; > +} > + > zend_object_handlers pdo_dbstmt_object_handlers; > > void pdo_stmt_init(TSRMLS_D) > @@ -2078,6 +2106,7 @@ > pdo_dbstmt_object_handlers.unset_property = dbstmt_prop_delete; > pdo_dbstmt_object_handlers.get_method = dbstmt_method_get; > pdo_dbstmt_object_handlers.compare_objects = dbstmt_compare; > + pdo_dbstmt_object_handlers.clone_obj = dbstmt_clone_obj; > > INIT_CLASS_ENTRY(ce, "PDORow", pdo_row_functions); > pdo_row_ce = zend_register_internal_class(&ce TSRMLS_CC); > @@ -2172,7 +2201,7 @@ > zend_hash_init(stmt->properties, 0, NULL, ZVAL_PTR_DTOR, 0); > zend_hash_copy(stmt->properties, &ce->default_properties, (copy_ctor_func_t) > zval_add_ref, (void *) &tmp, sizeof(zval *)); > > - retval.handle = zend_objects_store_put(stmt, > (zend_objects_store_dtor_t)zend_objects_destroy_object, > (zend_objects_free_object_storage_t)pdo_dbstmt_free_storage, NULL TSRMLS_CC); > + retval.handle = zend_objects_store_put(stmt, > (zend_objects_store_dtor_t)zend_objects_destroy_object, > (zend_objects_free_object_storage_t)pdo_dbstmt_free_storage, > (zend_objects_store_clone_t)dbstmt_clone_obj TSRMLS_CC); > retval.handlers = &pdo_dbstmt_object_handlers; > > return retval; > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > >