Fixed bug #38535 (memory corruption in pdo_pgsql driver on error retrieval

inside a failed query executed via query() method).

diff --git a/NEWS b/NEWS
index 8042d8f0baa14f0b7d942e05ab35acba8922a183..baa861e446f61857be40fff2c0f597572e751ddd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,14 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Sep 2006, PHP 5.2.0
+- Fixed bug #38535 (memory corruption in pdo_pgsql driver on error retrieval
+  inside a failed query executed via query() method). (Ilia)
 - Fixed bug #38524 (strptime() does not initialize the internal date storage
   structure). (Ilia)
 - Fixed PECL bug #8112 (OCI8 persistent connections misbehave when Apache 
   process times out). (Tony)
 
+
 17 Aug 2006, PHP 5.2.0RC2
 - Increased default memory limit to 16 megabytes to accommodate for a more
   accurate memory utilization measurement.

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index 2b0596fd6346187c0614751fcd208d01cc9a23e5..45df0b12216d4f6ce5aac6fa62b597e0efc6eedf 100755 (executable)
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -1053,9 +1053,6 @@ static PHP_METHOD(PDO, query)
                zval_dtor(return_value);
        }
 
-       /* kill the object handle for the stmt here */
-       zval_dtor(return_value);
-
        RETURN_FALSE;
 }
 /* }}} */