svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/ext/pdo/pdo_dbh.c trunk/ext/pdo/pdo_dbh.c

laruence Tue, 06 Mar 2012 03:45:27 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=323935 Log: Fixed bug #61292 (Segfault while calling a method on an overloaded PDO object) Bug: https://bugs.php.net/61292 (Verified) Segfault while calling a method on an overloaded PDO object. Changed paths: U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/ext/pdo/pdo_dbh.c U php/php-src/trunk/ext/pdo/pdo_dbh.c Modified: php/php-src/branches/PHP_5_4/NEWS =================================================================== --- php/php-src/branches/PHP_5_4/NEWS 2012-03-06 02:21:04 UTC (rev 323934) +++ php/php-src/branches/PHP_5_4/NEWS 2012-03-06 03:45:27 UTC (rev 323935) @@ -49,6 +49,10 @@ . 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) Modified: php/php-src/branches/PHP_5_4/ext/pdo/pdo_dbh.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/pdo/pdo_dbh.c 2012-03-06 02:21:04 UTC (rev 323934) +++ php/php-src/branches/PHP_5_4/ext/pdo/pdo_dbh.c 2012-03-06 03:45:27 UTC (rev 323935) @@ -343,6 +343,7 @@ 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); Modified: php/php-src/trunk/ext/pdo/pdo_dbh.c =================================================================== --- php/php-src/trunk/ext/pdo/pdo_dbh.c 2012-03-06 02:21:04 UTC (rev 323934) +++ php/php-src/trunk/ext/pdo/pdo_dbh.c 2012-03-06 03:45:27 UTC (rev 323935) @@ -343,6 +343,7 @@ 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);