diff options
| author | Dan Kalowsky <kalowsky@php.net> | 2001-04-19 19:55:05 +0000 |
|---|---|---|
| committer | Dan Kalowsky <kalowsky@php.net> | 2001-04-19 19:55:05 +0000 |
| commit | d7383e3255c6998bf71a577657f90dc291d3151e (patch) | |
| tree | 1f11af0a2f6bc9f42503ab2fff3e498a7178bdce /ext/odbc/php_odbc.c | |
| parent | 02af513c0d136daab8bdb2f0296fb8afd3dcd315 (diff) | |
| download | php-git-d7383e3255c6998bf71a577657f90dc291d3151e.tar.gz | |
appling patch for joey since he has no ODBC karma. this is for bug #10252
Diffstat (limited to 'ext/odbc/php_odbc.c')
| -rw-r--r-- | ext/odbc/php_odbc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 3c14890ef1..7d62f6587a 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -1929,6 +1929,7 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int char dsnbuf[300]; short dsnbuflen; char *ldb = 0; + int ldb_len = 0; if (strstr((char*)db, ";")) { direct = 1; @@ -1937,8 +1938,9 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int 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); } } |