cvs: php4 /ext/odbc php_odbc.c
| From: | Dan Kalowsky | Date: | Thu, 19 Apr 2001 19:55:05 +0000 |
| Subject: | cvs: php4 /ext/odbc php_odbc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5167@lists.php.net to get a copy of this message | ||
kalowsky Thu Apr 19 12:55:05 2001 EDT
Modified files:
/php4/ext/odbc php_odbc.c
Log:
appling patch for joey since he has no ODBC karma. this is for bug #10252
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.80 php4/ext/odbc/php_odbc.c:1.81
--- php4/ext/odbc/php_odbc.c:1.80 Wed Apr 18 21:16:27 2001
+++ php4/ext/odbc/php_odbc.c Thu Apr 19 12:55:05 2001
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.80 2001/04/19 04:16:27 andi Exp $ */
+/* $Id: php_odbc.c,v 1.81 2001/04/19 19:55:05 kalowsky Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1929,6 +1929,7 @@
char dsnbuf[300];
short dsnbuflen;
char *ldb = 0;
+ int ldb_len = 0;
if (strstr((char*)db, ";")) {
direct = 1;
@@ -1937,8 +1938,9 @@
ldb = (char*)emalloc(strlen(db) + strlen(uid) + strlen(pwd) + 12);
sprintf(ldb, "%s;UID=%s;PWD=%s", db, uid, pwd);
} else {
- ldb = (char*)emalloc(strlen(db) + 1);
- strcat(ldb, db);
+ ldb_len = (strlen(db)+1);
+ ldb = (char*)emalloc(ldb_len);
+ strlcpy(ldb, db, ldb_len);
}
}