cvs: php4 /ext/odbc php_odbc.c
| From: | Jani Taskinen | Date: | Sat, 31 May 2003 02:30:50 +0000 |
| Subject: | cvs: php4 /ext/odbc php_odbc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-21410@lists.php.net to get a copy of this message | ||
sniper Fri May 30 22:30:50 2003 EDT
Modified files:
/php4/ext/odbc php_odbc.c
Log:
MFB
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.162 php4/ext/odbc/php_odbc.c:1.163
--- php4/ext/odbc/php_odbc.c:1.162 Fri May 30 10:44:15 2003
+++ php4/ext/odbc/php_odbc.c Fri May 30 22:30:50 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.162 2003/05/30 14:44:15 iliaa Exp $ */
+/* $Id: php_odbc.c,v 1.163 2003/05/31 02:30:50 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2088,7 +2088,7 @@
* #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 @@
}
}
- 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);