summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-03-06 03:45:27 +0000
committerXinchen Hui <laruence@php.net>2012-03-06 03:45:27 +0000
commita32a1992011a650c0b0776a2e7f9de820bf2b08a (patch)
treedd53461746c7b4cb17cb7d417537a6a18f5c5198
parentd796ebb0b558b6b5d01f3ee055a1ebc8c85510cc (diff)
downloadphp-git-a32a1992011a650c0b0776a2e7f9de820bf2b08a.tar.gz
Fixed bug #61292 (Segfault while calling a method on an overloaded PDO object)
-rw-r--r--NEWS4
-rwxr-xr-xext/pdo/pdo_dbh.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 168931cfef..9cb9f41c16 100644
--- 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)
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index d718ddb43f..b4f383c94f 100755
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -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);