scottmac                Sun Mar  9 21:32:38 2008 UTC

  Modified files:              
    /php-src/ext/sqlite sqlite.c 
  Log:
  MFB: Fix memory issues with statement being deleted twice
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.207&r2=1.208&diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.207 php-src/ext/sqlite/sqlite.c:1.208
--- php-src/ext/sqlite/sqlite.c:1.207   Sat Mar  8 04:17:30 2008
+++ php-src/ext/sqlite/sqlite.c Sun Mar  9 21:32:38 2008
@@ -17,7 +17,7 @@
    |          Marcus Boerger <[EMAIL PROTECTED]>                              |
    +----------------------------------------------------------------------+
 
-   $Id: sqlite.c,v 1.207 2008/03/08 04:17:30 scottmac Exp $
+   $Id: sqlite.c,v 1.208 2008/03/09 21:32:38 scottmac Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -454,10 +454,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)
@@ -1231,7 +1231,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.207 2008/03/08 04:17:30 scottmac 
Exp $");
+       php_info_print_table_row(2, "PECL Module version", 
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.208 2008/03/09 21:32:38 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();



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to