MFB

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 9c149ef0e41fe24ded8b70d38db0b0b5afdf6553..57f67dba8da97b836ffcf5fd8ff6c2a385f9ca77 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -2088,7 +2088,7 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int
  * #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 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int
                        }
                }
 
-               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);