felipe                                   Thu, 29 Jul 2010 23:38:55 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=301706

Log:
- Fixed bug #52487 (PDO::FETCH_INTO leaks memory)

Bug: http://bugs.php.net/52487 (Open) PDO::FETCH_INTO leaks memory
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c
    U   php/php-src/trunk/ext/pdo/pdo_stmt.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2010-07-29 22:07:00 UTC (rev 301705)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-07-29 23:38:55 UTC (rev 301706)
@@ -1,7 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2010, PHP 5.3.4
-
+- Fixed bug #52487 (PDO::FETCH_INTO leaks memory). (Felipe)
 - Fixed bug #52436 (Compile error if systems do not have stdint.h)
   (Sriram Natarajan)


Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c     2010-07-29 22:07:00 UTC 
(rev 301705)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c     2010-07-29 23:38:55 UTC 
(rev 301706)
@@ -1887,7 +1887,7 @@
        switch (stmt->default_fetch_type) {
                case PDO_FETCH_INTO:
                        if (stmt->fetch.into) {
-                               Z_DELREF_P(stmt->fetch.into);
+                               zval_ptr_dtor(&stmt->fetch.into);
                                stmt->fetch.into = NULL;
                        }
                        break;

Modified: php/php-src/trunk/ext/pdo/pdo_stmt.c
===================================================================
--- php/php-src/trunk/ext/pdo/pdo_stmt.c        2010-07-29 22:07:00 UTC (rev 
301705)
+++ php/php-src/trunk/ext/pdo/pdo_stmt.c        2010-07-29 23:38:55 UTC (rev 
301706)
@@ -1887,7 +1887,7 @@
        switch (stmt->default_fetch_type) {
                case PDO_FETCH_INTO:
                        if (stmt->fetch.into) {
-                               Z_DELREF_P(stmt->fetch.into);
+                               zval_ptr_dtor(&stmt->fetch.into);
                                stmt->fetch.into = NULL;
                        }
                        break;

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

Reply via email to