cvs: php-src /ext/odbc php_odbc.c
| From: | Dan Kalowsky | Date: | Fri, 11 Jul 2003 13:13:32 +0000 |
| Subject: | cvs: php-src /ext/odbc php_odbc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-22514@lists.php.net to get a copy of this message | ||
kalowsky Fri Jul 11 09:13:32 2003 EDT
Modified files:
/php-src/ext/odbc php_odbc.c
Log:
Fix for bug #22897
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.166 php-src/ext/odbc/php_odbc.c:1.167
--- php-src/ext/odbc/php_odbc.c:1.166 Mon Jun 16 12:36:41 2003
+++ php-src/ext/odbc/php_odbc.c Fri Jul 11 09:13:32 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.166 2003/06/16 16:36:41 andrey Exp $ */
+/* $Id: php_odbc.c,v 1.167 2003/07/11 13:13:32 kalowsky Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2065,7 +2065,7 @@
#endif
#ifdef HAVE_OPENLINK
{
- char dsnbuf[300];
+ char dsnbuf[1024];
short dsnbuflen;
rc = SQLDriverConnect((*conn)->hdbc, NULL, db, SQL_NTS,
@@ -2107,8 +2107,8 @@
}
if (direct) {
- rc = SQLDriverConnect((*conn)->hdbc, NULL, ldb, strlen(ldb), dsnbuf, sizeof(dsnbuf),
- &dsnbuflen, SQL_DRIVER_NOPROMPT);
+ rc = SQLDriverConnect((*conn)->hdbc, NULL, ldb, strlen(ldb), dsnbuf,
+ sizeof(dsnbuf) - 1, &dsnbuflen, SQL_DRIVER_NOPROMPT);
} else {
rc = SQLConnect((*conn)->hdbc, db, SQL_NTS, uid, SQL_NTS, pwd, SQL_NTS);
}