appling patch for joey since he has no ODBC karma. this is for bug #10252

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 3c14890ef1db2508199fd851366b7da33be4ce92..7d62f6587a63ad8f2dea8e3ad1011084a4a299fa 100644 (file)
--- 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);
                        }
                }