[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo_stmt.c

[Ilia Alshanetsky]

iliaa           Tue Aug  1 15:06:01 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/pdo    pdo_stmt.c 
  Log:
  Fixed memory leak on unused bound name parameters.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.5&r2=1.118.2.38.2.6&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.5 
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.6
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.5   Mon Jul 31 20:18:11 2006
+++ php-src/ext/pdo/pdo_stmt.c  Tue Aug  1 15:06:01 2006
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.5 2006/07/31 20:18:11 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.6 2006/08/01 15:06:01 iliaa Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -1538,7 +1538,11 @@
        }
 
        ZVAL_ADDREF(param.parameter);
-       return really_register_bound_param(&param, stmt, is_param TSRMLS_CC);
+       if (!really_register_bound_param(&param, stmt, is_param TSRMLS_CC)) {
+               zval_ptr_dtor(&(param.parameter));
+               return 0;
+       }
+       return 1;
 } /* }}} */
 
 /* {{{ proto bool PDOStatement::bindValue(mixed $paramno, mixed $param [, int 
$type ])
@@ -1567,7 +1571,11 @@
        }
        
        ZVAL_ADDREF(param.parameter);
-       RETURN_BOOL(really_register_bound_param(&param, stmt, TRUE TSRMLS_CC));
+       if (!really_register_bound_param(&param, stmt, TRUE TSRMLS_CC)) {
+               zval_ptr_dtor(&(param.parameter));
+               RETURN_FALSE;
+       }
+       RETURN_TRUE;
 }
 /* }}} */
 

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