diff options
Diffstat (limited to 'ext/mssql/php_mssql.c')
| -rw-r--r-- | ext/mssql/php_mssql.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index 1afc79bf53..957e4d9c47 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -206,9 +206,10 @@ static void _free_mssql_statement(mssql_statement *statement) efree(statement); } -static void _free_mssql_result(zend_rsrc_list_entry *rsrc) +static void _free_mssql_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) { mssql_result *result = (mssql_result *)rsrc->ptr; + _free_result(result, 1); efree(result); } @@ -222,10 +223,9 @@ static void php_mssql_set_default_link(int id TSRMLS_DC) zend_list_addref(id); } -static void _close_mssql_link(zend_rsrc_list_entry *rsrc) +static void _close_mssql_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) { mssql_link *mssql_ptr = (mssql_link *)rsrc->ptr; - TSRMLS_FETCH(); mssql_ptr->valid = 0; zend_hash_apply(&EG(regular_list),(apply_func_t) _clean_invalid_results TSRMLS_CC); @@ -236,10 +236,9 @@ static void _close_mssql_link(zend_rsrc_list_entry *rsrc) } -static void _close_mssql_plink(zend_rsrc_list_entry *rsrc) +static void _close_mssql_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) { mssql_link *mssql_ptr = (mssql_link *)rsrc->ptr; - TSRMLS_FETCH(); dbclose(mssql_ptr->link); dbfreelogin(mssql_ptr->login); |