diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-04-15 00:59:42 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-04-15 00:59:42 +0000 |
| commit | f1bd3d539f45169001adf8896d7db332894bcb2a (patch) | |
| tree | c5d2fddd813a4ab236f8f1986168821fed557514 /ext/sybase/php_sybase_db.c | |
| parent | da540a4d3b351c8457f5fd05d87d45772b88fa94 (diff) | |
| download | php-git-f1bd3d539f45169001adf8896d7db332894bcb2a.tar.gz | |
Fixed bug #23187 (memory leaks in sybase_connect/sybase_pconnect).
Intial patch by: fukusaka@xa2.so-net.ne.jp
Diffstat (limited to 'ext/sybase/php_sybase_db.c')
| -rw-r--r-- | ext/sybase/php_sybase_db.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c index d96dad533d..877de25005 100644 --- a/ext/sybase/php_sybase_db.c +++ b/ext/sybase/php_sybase_db.c @@ -481,6 +481,7 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) if (Z_TYPE_P(le) != php_sybase_module.le_plink) { php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase: Hashed persistent link is not a Sybase link!"); efree(hashed_details); + dbloginfree(sybase.login); RETURN_FALSE; } @@ -491,11 +492,13 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) /*php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase: Link to server lost, unable to reconnect");*/ zend_hash_del(&EG(persistent_list), hashed_details, hashed_details_length+1); efree(hashed_details); + dbloginfree(sybase.login); RETURN_FALSE; } if (dbsetopt(sybase_ptr->link,DBBUFFER,"2",-1)==FAIL) { zend_hash_del(&EG(persistent_list), hashed_details, hashed_details_length+1); efree(hashed_details); + dbloginfree(sybase.login); RETURN_FALSE; } } @@ -516,6 +519,7 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) if (Z_TYPE_P(index_ptr) != le_index_ptr) { efree(hashed_details); + dbloginfree(sybase.login); RETURN_FALSE; } link = (int) index_ptr->ptr; @@ -524,6 +528,7 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) Z_LVAL_P(return_value) = php_sybase_module.default_link = link; Z_TYPE_P(return_value) = IS_LONG; efree(hashed_details); + dbloginfree(sybase.login); return; } else { zend_hash_del(&EG(regular_list),hashed_details,hashed_details_length+1); @@ -532,12 +537,14 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) if (php_sybase_module.max_links!=-1 && php_sybase_module.num_links>=php_sybase_module.max_links) { php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase: Too many open links (%d)",php_sybase_module.num_links); efree(hashed_details); + dbloginfree(sybase.login); RETURN_FALSE; } if ((sybase.link=PHP_SYBASE_DBOPEN(sybase.login,host))==NULL) { /*php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase: Unable to connect to server: %s",sybase_error(sybase));*/ efree(hashed_details); + dbloginfree(sybase.login); RETURN_FALSE; } @@ -559,6 +566,8 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) Z_TYPE(new_index_ptr) = 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) { efree(hashed_details); + dbloginfree(sybase.login); + dbclose(sybase.link); RETURN_FALSE; } php_sybase_module.num_links++; |