iliaa           Sat Dec 17 20:00:00 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/pdo    pdo_stmt.c 
  Log:
  Fixed memory corruption when FETCH_LAZY mode is being used.
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.27&r2=1.118.2.28&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.27 
php-src/ext/pdo/pdo_stmt.c:1.118.2.28
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.27       Thu Dec 15 22:33:01 2005
+++ php-src/ext/pdo/pdo_stmt.c  Sat Dec 17 20:00:00 2005
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pdo_stmt.c,v 1.118.2.27 2005/12/15 22:33:01 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.28 2005/12/17 20:00:00 iliaa Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -228,7 +228,7 @@
                Z_TYPE(stmt->lazy_object_ref) = IS_OBJECT;
                Z_OBJ_HANDLE(stmt->lazy_object_ref) = 
zend_objects_store_put(stmt, 
(zend_objects_store_dtor_t)zend_objects_destroy_object, 
(zend_objects_free_object_storage_t)pdo_row_free_storage, NULL TSRMLS_CC);
                Z_OBJ_HT(stmt->lazy_object_ref) = &pdo_row_object_handlers;
-               /* stmt->refcount++; */
+               stmt->refcount++;
        }
        Z_TYPE_P(return_value) = IS_OBJECT;
        Z_OBJ_HANDLE_P(return_value) = Z_OBJ_HANDLE(stmt->lazy_object_ref);
@@ -2472,13 +2472,11 @@
 
 void pdo_row_free_storage(pdo_stmt_t *stmt TSRMLS_DC)
 {
-#if 0
        ZVAL_NULL(&stmt->lazy_object_ref);
        
        if (--stmt->refcount == 0) {
                free_statement(stmt TSRMLS_CC);
        }
-#endif
 }
 
 zend_object_value pdo_row_new(zend_class_entry *ce TSRMLS_DC)

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

Reply via email to