cvs: php4 /ext/sybase php_sybase_db.c

From: Date: Tue, 15 Apr 2003 00:59:42 +0000
Subject: cvs: php4 /ext/sybase php_sybase_db.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-20280@lists.php.net to get a copy of this message
iliaa Mon Apr 14 20:59:42 2003 EDT Modified files: /php4/ext/sybase php_sybase_db.c Log: Fixed bug #23187 (memory leaks in sybase_connect/sybase_pconnect). Intial patch by: fukusaka@xa2.so-net.ne.jp Index: php4/ext/sybase/php_sybase_db.c diff -u php4/ext/sybase/php_sybase_db.c:1.46 php4/ext/sybase/php_sybase_db.c:1.47 --- php4/ext/sybase/php_sybase_db.c:1.46 Wed Jan 29 21:33:13 2003 +++ php4/ext/sybase/php_sybase_db.c Mon Apr 14 20:59:41 2003 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.46 2003/01/30 02:33:13 iliaa Exp $ */ +/* $Id: php_sybase_db.c,v 1.47 2003/04/15 00:59:41 iliaa Exp $ */ #ifdef HAVE_CONFIG_H @@ -481,6 +481,7 @@ 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 @@ /*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 @@ 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 @@ 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 @@ 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 @@ 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++;

« previous php.cvs (#20280) next »