cvs: php4(PHP_4_3) /ext/sybase php_sybase_db.c
| From: | Ilia Alshanetsky | Date: | Tue, 15 Apr 2003 00:59:51 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/sybase php_sybase_db.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20281@lists.php.net to get a copy of this message | ||
iliaa Mon Apr 14 20:59:51 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/sybase php_sybase_db.c
Log:
MFH
Index: php4/ext/sybase/php_sybase_db.c
diff -u php4/ext/sybase/php_sybase_db.c:1.38.2.5 php4/ext/sybase/php_sybase_db.c:1.38.2.6
--- php4/ext/sybase/php_sybase_db.c:1.38.2.5 Tue Dec 31 11:35:36 2002
+++ php4/ext/sybase/php_sybase_db.c Mon Apr 14 20:59:50 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_db.c,v 1.38.2.5 2002/12/31 16:35:36 sebastian Exp $ */
+/* $Id: php_sybase_db.c,v 1.38.2.6 2003/04/15 00:59:50 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
@@ -481,6 +481,7 @@
if (Z_TYPE_P(le) != php_sybase_module.le_plink) {
php_error(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(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(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(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++;