mirror of
https://github.com/php/php-src.git
synced 2024-09-23 02:47:26 +00:00
Fix a shutdown order issue I saw in the pgsql driver. Hope this doesn't mess
up something in the OCI driver; I think I've been here before.
This commit is contained in:
parent
206c7b8372
commit
8f31f0cfaa
@ -1838,6 +1838,19 @@ static void free_statement(pdo_stmt_t *stmt TSRMLS_DC)
|
||||
stmt->properties = NULL;
|
||||
}
|
||||
|
||||
if (stmt->bound_params) {
|
||||
zend_hash_destroy(stmt->bound_params);
|
||||
FREE_HASHTABLE(stmt->bound_params);
|
||||
}
|
||||
if (stmt->bound_param_map) {
|
||||
zend_hash_destroy(stmt->bound_param_map);
|
||||
FREE_HASHTABLE(stmt->bound_param_map);
|
||||
}
|
||||
if (stmt->bound_columns) {
|
||||
zend_hash_destroy(stmt->bound_columns);
|
||||
FREE_HASHTABLE(stmt->bound_columns);
|
||||
}
|
||||
|
||||
if (stmt->methods && stmt->methods->dtor) {
|
||||
stmt->methods->dtor(stmt TSRMLS_CC);
|
||||
}
|
||||
@ -1855,18 +1868,6 @@ static void free_statement(pdo_stmt_t *stmt TSRMLS_DC)
|
||||
efree(stmt->columns);
|
||||
}
|
||||
|
||||
if (stmt->bound_params) {
|
||||
zend_hash_destroy(stmt->bound_params);
|
||||
FREE_HASHTABLE(stmt->bound_params);
|
||||
}
|
||||
if (stmt->bound_param_map) {
|
||||
zend_hash_destroy(stmt->bound_param_map);
|
||||
FREE_HASHTABLE(stmt->bound_param_map);
|
||||
}
|
||||
if (stmt->bound_columns) {
|
||||
zend_hash_destroy(stmt->bound_columns);
|
||||
FREE_HASHTABLE(stmt->bound_columns);
|
||||
}
|
||||
|
||||
do_fetch_opt_finish(stmt, 1 TSRMLS_CC);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user