]> granicus.if.org Git - php/commitdiff
Fixed bug #61292 (Segfault while calling a method on an overloaded PDO object)
authorXinchen Hui <laruence@php.net>
Tue, 6 Mar 2012 03:45:27 +0000 (03:45 +0000)
committerXinchen Hui <laruence@php.net>
Tue, 6 Mar 2012 03:45:27 +0000 (03:45 +0000)
NEWS
ext/pdo/pdo_dbh.c

diff --git a/NEWS b/NEWS
index 168931cfefbb45c25b567c2e42c0c60c12d74d11..9cb9f41c1604dd7f2b0699bc218574b8f184a836 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -49,6 +49,10 @@ PHP                                                                        NEWS
   . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
     User-Agent header). (carloschilazo at gmail dot com)
 
+- PDO
+  . Fixed bug #61292 (Segfault while calling a method on an overloaded PDO 
+    object). (Laruence)
+
 - PDO_mysql
   . Fixed bug #61207 (PDO::nextRowset() after a multi-statement query doesn't
     always work). (Johannes)
index d718ddb43f796002c5868b7305a4e50efcc7f027..b4f383c94f01570fb250dd69ed8173d418174a4e 100755 (executable)
@@ -343,6 +343,7 @@ static PHP_METHOD(PDO, dbh_constructor)
                                pdbh->def_stmt_ce = dbh->def_stmt_ce;
                                pdbh->def_stmt_ctor_args = dbh->def_stmt_ctor_args;
                                pdbh->std.properties = dbh->std.properties;
+                               pdbh->std.properties_table = dbh->std.properties_table;
                        }
                        /* kill the non-persistent thingamy */
                        efree(dbh);