aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/psql/psql.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index 6f62b57ccea..1597c5561b4 100644
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.61 1997/05/22 18:55:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.62 1997/05/22 23:57:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -836,7 +836,7 @@ do_connect(const char *new_dbname,
fprintf(stderr, "\\connect must be followed by a database name\n");
else {
PGconn *olddb = settings->db;
- char *userenv;
+ static char *userenv = NULL;
printf("closing connection to database: %s\n", dbname);
if (new_user != NULL) {
@@ -844,10 +844,11 @@ do_connect(const char *new_dbname,
PQsetdb() does not allow us to specify the user,
so we have to do it via PGUSER
*/
+ if (userenv != NULL)
+ free(userenv);
userenv = malloc(strlen("PGUSER=") + strlen(new_user) + 1);
sprintf(userenv,"PGUSER=%s",new_user);
- putenv(userenv);
- free(userenv);
+ putenv(userenv); /* putenv() continues to use memory in env. */
}
settings->db = PQsetdb(PQhost(olddb), PQport(olddb),
NULL, NULL, new_dbname);