From 7ba00c2563fafceb428fd4a5a2bdcfaeecc13e97 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Mon, 8 Dec 2003 09:46:07 +0000 Subject: [PATCH] Corrected ibase_close() fix --- ext/interbase/interbase.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index b056ac7782..c2c4df728f 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -934,13 +934,14 @@ PHP_FUNCTION(ibase_pconnect) Close an InterBase connection */ PHP_FUNCTION(ibase_close) { - zval **link_arg = NULL; ibase_db_link *ib_link; - int link_id = -1; + int link_id; RESET_ERRMSG; switch (ZEND_NUM_ARGS()) { + zval **link_arg; + case 0: link_id = IBG(default_link); break; @@ -949,13 +950,14 @@ PHP_FUNCTION(ibase_close) RETURN_FALSE; } convert_to_long_ex(link_arg); + link_id = Z_LVAL_PP(link_arg); break; default: WRONG_PARAM_COUNT; break; } - ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, link_arg, link_id, "InterBase link", le_link, le_plink); + ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL, link_id, "InterBase link", le_link, le_plink); zend_list_delete(link_id); RETURN_TRUE; } -- 2.50.1