diff options
| author | Hénot David <henot@php.net> | 2000-08-05 03:22:16 +0000 |
|---|---|---|
| committer | Hénot David <henot@php.net> | 2000-08-05 03:22:16 +0000 |
| commit | 282288efe42d82bd85cdbea60bd6cf524f6d991a (patch) | |
| tree | 831611e9dcfc1f18e57d3ca094b9494e8bbd74be | |
| parent | b3df7086d71db1be9d693ede24ae24a64f6775ab (diff) | |
| download | php-git-282288efe42d82bd85cdbea60bd6cf524f6d991a.tar.gz | |
Fix for a bug with persistent connections.
| -rw-r--r-- | ext/ingres_ii/ii.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/ingres_ii/ii.c b/ext/ingres_ii/ii.c index 3aa7934171..e548a4f1c7 100644 --- a/ext/ingres_ii/ii.c +++ b/ext/ingres_ii/ii.c @@ -154,7 +154,7 @@ static void _close_ii_link(II_LINK *link) IIapi_disconnect(&disconnParm); - efree(link); + free(link); IIG(num_links)--; } @@ -435,7 +435,7 @@ static void php_ii_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) RETURN_FALSE; } - link = (II_LINK *) emalloc(sizeof(II_LINK)); + link = (II_LINK *) malloc(sizeof(II_LINK)); link->connHandle = connParm.co_connHandle; link->tranHandle = NULL; link->stmtHandle = NULL; @@ -447,6 +447,7 @@ static void php_ii_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) new_le.ptr = link; if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_details_length+1, (void *) &new_le, sizeof(list_entry), NULL)==FAILURE) { php_error(E_WARNING,"Ingres II: Unable to hash (%s)", hashed_details); + free(link); efree(hashed_details); RETURN_FALSE; } @@ -516,7 +517,7 @@ static void php_ii_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) RETURN_FALSE; } - link = (II_LINK *) emalloc(sizeof(II_LINK)); + link = (II_LINK *) malloc(sizeof(II_LINK)); link->connHandle = connParm.co_connHandle; link->tranHandle = NULL; link->stmtHandle = NULL; @@ -531,13 +532,14 @@ static void php_ii_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) new_index_ptr.type = le_index_ptr; if (zend_hash_update(&EG(regular_list),hashed_details,hashed_details_length+1,(void *) &new_index_ptr, sizeof(list_entry), NULL)==FAILURE) { php_error(E_WARNING,"Ingres II: Unable to hash (%s)", hashed_details); + free(link); efree(hashed_details); RETURN_FALSE; } IIG(num_links)++; } - efree(hashed_details); + efree(hashed_details); php_ii_set_default_link(return_value->value.lval); } |