mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-07 19:44:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4' into PHP-5.5

Browse Source
This commit is contained in:
Xinchen Hui 2013-06-16 22:56:22 +08:00
commit 6cd6349ff8
2 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/pdo/pdo_dbh.c
View File

@ -338,6 +338,9 @@ static PHP_METHOD(PDO, dbh_constructor)
if (pdbh->std.properties) {
zend_hash_destroy(dbh->std.properties);
efree(dbh->std.properties);
if (dbh->std.properties_table) {
efree(dbh->std.properties_table);
}
} else {
pdbh->std.ce = dbh->std.ce;
pdbh->def_stmt_ce = dbh->def_stmt_ce;
@ -1575,6 +1578,7 @@ static void pdo_dbh_free_storage(pdo_dbh_t *dbh TSRMLS_DC)
}
zend_object_std_dtor(&dbh->std TSRMLS_CC);
dbh->std.properties = NULL;
dbh->std.properties_table = NULL;
dbh_free(dbh TSRMLS_CC);
}

54
ext/pdo_mysql/tests/bug63176.phpt Normal file
View File

@ -0,0 +1,54 @@
--TEST--
Bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db server)
--SKIPIF--
<?php
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
MySQLPDOTest::skip();
?>
--FILE--
<?php
require(dirname(__FILE__). DIRECTORY_SEPARATOR . 'config.inc');
class PDO2 extends PDO {
protected $transLevel;
}
class PDO3 extends PDO {
protected $tomato;
}
class ModelA {
public function __construct($h) {
var_dump($h);
if ($h) {
$this->db = new PDO2(PDO_MYSQL_TEST_DSN, PDO_MYSQL_TEST_USER, PDO_MYSQL_TEST_PASS, array(PDO::ATTR_PERSISTENT => true));
} else {
$this->db = new PDO2(PDO_MYSQL_TEST_DSN, PDO_MYSQL_TEST_USER, PDO_MYSQL_TEST_PASS, array(PDO::ATTR_PERSISTENT => true));
}
$this->db->query('SELECT 1')->fetchAll();
}
}
$a = new ModelA(true);
$b = new ModelA(false);
var_dump($a);
var_dump($b);
--EXPECTF--
bool(true)
bool(false)
object(ModelA)#%d (1) {
["db"]=>
object(PDO2)#%d (1) {
["transLevel":protected]=>
NULL
}
}
object(ModelA)#%d (1) {
["db"]=>
object(PDO2)#%d (1) {
["transLevel":protected]=>
NULL
}
}