mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- libpq calls "fe_getauthname()" two times in "fe-connect.c", but

Browse Source 
doesn't free the buffer allocated by this function.

- submitted by: Erich Stamberger <eberger@gewi.kfunigraz.ac.at>
This commit is contained in:
Marc G. Fournier 1996-07-19 07:00:56 +00:00
parent df1a06ed37
commit 3704b99522
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/interfaces/libpq/fe-connect.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.2 1996/07/12 04:53:57 scrappy Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.3 1996/07/19 07:00:56 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -114,20 +114,23 @@ PQsetdb(char *pghost, char* pgport, char* pgoptions, char* pgtty, char* dbName)
} else } else
conn->pgoptions = strdup(pgoptions); conn->pgoptions = strdup(pgoptions);
if (!dbName || dbName[0] == '\0') { if (((tmp = dbName) && (dbName[0] != '\0')) ||
char errorMessage[ERROR_MSG_LENGTH]; ((tmp = getenv("PGDATABASE"))))
if (!(tmp = getenv("PGDATABASE")) &&
!(tmp = fe_getauthname(errorMessage))) {
sprintf(conn->errorMessage,
"FATAL: PQsetdb: Unable to determine a database name!\n");
/* pqdebug("%s", conn->errorMessage); */
conn->dbName = NULL;
return conn;
}
conn->dbName = strdup(tmp); conn->dbName = strdup(tmp);
} else else {
conn->dbName = strdup(dbName); char errorMessage[ERROR_MSG_LENGTH];
if (tmp = fe_getauthname(errorMessage)) {
conn->dbName = strdup(tmp);
free(tmp);
}
else {
sprintf(conn->errorMessage,
"FATAL: PQsetdb: Unable to determine a database name!\n");
/* pqdebug("%s", conn->errorMessage); */
conn->dbName = NULL;
return conn;
}
}
conn->status = connectDB(conn); conn->status = connectDB(conn);
return conn; return conn;
} }
@ -164,8 +167,9 @@ connectDB(PGconn *conn)
user = fe_getauthname(conn->errorMessage); user = fe_getauthname(conn->errorMessage);
if (!user) if (!user)
goto connect_errReturn; goto connect_errReturn;
strncpy(startup.database,conn->dbName,sizeof(startup.database));
strncpy(startup.user,user,sizeof(startup.user)); strncpy(startup.user,user,sizeof(startup.user));
free(user);
strncpy(startup.database,conn->dbName,sizeof(startup.database));
strncpy(startup.tty,conn->pgtty,sizeof(startup.tty)); strncpy(startup.tty,conn->pgtty,sizeof(startup.tty));
if (conn->pgoptions) { if (conn->pgoptions) {
strncpy(startup.options,conn->pgoptions, sizeof(startup.options)); strncpy(startup.options,conn->pgoptions, sizeof(startup.options));