diff options
author | Xinchen Hui <laruence@php.net> | 2013-06-16 22:57:01 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@php.net> | 2013-06-16 22:57:01 +0800 |
commit | 0842d5c06e14f639c10c6690fca7d786fd974728 (patch) | |
tree | 82eec4ee32f7583adcfb57787c2b1988862f0a0c /ext/pdo | |
parent | 3457096758c7de98ee6740983d20469f74f1f446 (diff) | |
parent | e3e4ec3f5569bcca5ed6ee784889e6b908c77374 (diff) | |
download | php-git-0842d5c06e14f639c10c6690fca7d786fd974728.tar.gz |
Merge branch 'PHP-5.5'
Diffstat (limited to 'ext/pdo')
-rw-r--r-- | ext/pdo/pdo_dbh.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index e6265f5807..25db6842f6 100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -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); } |