cvs: php-src(PHP_5_3) /ext/sqlite sqlite.c

From: Date: Sun, 09 Mar 2008 21:30:28 +0000
Subject: cvs: php-src(PHP_5_3) /ext/sqlite sqlite.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-49011@lists.php.net to get a copy of this message
scottmac Sun Mar 9 21:30:28 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite sqlite.c Log: Fix memory issues with statement being deleted twice http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.166.2.13.2.9.2.4&r2=1.166.2.13.2.9.2.5&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.4 php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.5 --- php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.4 Sat Mar 8 04:18:29 2008 +++ php-src/ext/sqlite/sqlite.c Sun Mar 9 21:30:28 2008 @@ -17,7 +17,7 @@ | Marcus Boerger <helly@php.net> | +----------------------------------------------------------------------+ - $Id: sqlite.c,v 1.166.2.13.2.9.2.4 2008/03/08 04:18:29 scottmac Exp $ + $Id: sqlite.c,v 1.166.2.13.2.9.2.5 2008/03/09 21:30:28 scottmac Exp $ */ #ifdef HAVE_CONFIG_H @@ -408,10 +408,10 @@ if (Z_TYPE_P(le) == le_sqlite_result) { struct php_sqlite_result *res = (struct php_sqlite_result *)le->ptr; if (res->db->rsrc_id == ((struct php_sqlite_db*)db)->rsrc_id) { - real_result_dtor(res TSRMLS_CC); + return ZEND_HASH_APPLY_REMOVE; } } - return 0; + return ZEND_HASH_APPLY_KEEP; } static ZEND_RSRC_DTOR_FUNC(php_sqlite_result_dtor) @@ -1139,7 +1139,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.4 2008/03/08 04:18:29 scottmac 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.5 2008/03/09 21:30:28 scottmac 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();

« previous php.cvs (#49011) next »