From: foobar Date: Sat, 31 May 2003 02:30:50 +0000 (+0000) Subject: MFB X-Git-Tag: RELEASE_1_0_2~494 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=935672787a263333b30232549ce44ba965901d38;p=php MFB --- diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 9c149ef0e4..57f67dba8d 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -2088,7 +2088,7 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int * #ifdef HAVE_EMPRESS */ { int direct = 0; - char dsnbuf[300]; + char dsnbuf[1024]; short dsnbuflen; char *ldb = 0; int ldb_len = 0; @@ -2105,13 +2105,16 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int } } - if (direct) - rc = SQLDriverConnect((*conn)->hdbc, NULL, ldb, strlen(ldb), dsnbuf, 300, + if (direct) { + rc = SQLDriverConnect((*conn)->hdbc, NULL, ldb, strlen(ldb), dsnbuf, sizeof(dsnbuf), &dsnbuflen, SQL_DRIVER_NOPROMPT); - else + } else { rc = SQLConnect((*conn)->hdbc, db, SQL_NTS, uid, SQL_NTS, pwd, SQL_NTS); - if (ldb) + } + + if (ldb) { efree(ldb); + } } #else rc = SQLConnect((*conn)->hdbc, db, SQL_NTS, uid, SQL_NTS, pwd, SQL_NTS);