Skip to content

Commit 9bca643

Browse files
committed
Merge branch 'PHP-7.2' into PHP-7.3
2 parents 40a345e + e845320 commit 9bca643

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

interbase.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -939,13 +939,15 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /*
939939

940940
xlink = (zend_resource*) le->ptr;
941941
if ((!persistent && xlink->type == le_link) || xlink->type == le_plink) {
942-
if (IBG(default_link)) {
943-
zend_list_close(IBG(default_link));
942+
if (IBG(default_link) != xlink) {
943+
GC_ADDREF(xlink);
944+
if (IBG(default_link)) {
945+
zend_list_delete(IBG(default_link));
946+
}
947+
IBG(default_link) = xlink;
944948
}
945949
GC_ADDREF(xlink);
946-
GC_ADDREF(xlink);
947-
IBG(default_link) = xlink;
948-
RETVAL_RES(xlink);
950+
RETURN_RES(xlink);
949951
} else {
950952
zend_hash_str_del(&EG(regular_list), hash, sizeof(hash)-1);
951953
}

0 commit comments

Comments
 (0)