CVS update: php3/functions

Date: Friday January 29, 1999 @ 17:34 Author: shane Update of /repository/php3/functions In directory asf:/u/temp/cvs-serv9954/functions Modified Files: unified_odbc.c Log Message: fix crash in odbc. seems not enough space was allocated here. Index: php3/functions/unified_odbc.c diff -c php3/functions/unified_odbc.c:1.100 php3/functions/unified_odbc.c:1.101 *** php3/functions/unified_odbc.c:1.100 Fri Jan 29 16:42:15 1999 --- php3/functions/unified_odbc.c Fri Jan 29 17:34:26 1999 *************** *** 29,35 **** +----------------------------------------------------------------------+ */ ! /* $Id: unified_odbc.c,v 1.100 1999/01/29 21:42:15 shane Exp $ */ /* This file is based on the Adabas D extension. * Adabas D will no longer be supported as separate module. --- 29,35 ---- +----------------------------------------------------------------------+ */ ! /* $Id: unified_odbc.c,v 1.101 1999/01/29 22:34:26 shane Exp $ */ /* This file is based on the Adabas D extension. * Adabas D will no longer be supported as separate module. *************** *** 1698,1703 **** --- 1698,1704 ---- char *hashed_details; int hashed_len, len, id, cur_opt; int type; + char tmp[5]; UODBC_TLS_VARS; UODBC_GLOBAL(PHP3_UODBC_MODULE).resource_list = list; *************** *** 1765,1771 **** RETURN_FALSE; } ! len = strlen(db) + strlen(uid) + strlen(pwd) + strlen(UODBC_NAME) + 5; hashed_details = emalloc(len); if (hashed_details == NULL) { --- 1766,1772 ---- RETURN_FALSE; } ! len = strlen(db) + strlen(uid) + strlen(pwd) + strlen(UODBC_NAME) + strlen(itoa(cur_opt,tmp,10)) + 5; hashed_details = emalloc(len); if (hashed_details == NULL) { *************** *** 1781,1787 **** /* try to find if we already have this link in our persistent list, * no matter if it is to be persistent or not */ - if ((persistent || (_php3_hash_find(list, hashed_details, hashed_len + 1, (void **) &index_ptr) == FAILURE || !php3_list_find((int) index_ptr->ptr, &type))) && _php3_hash_find(plist, hashed_details, hashed_len + 1, --- 1782,1787 ---- -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net