77 *
88 *
99 * IDENTIFICATION
10- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.29 1996/11/14 16:08:03 momjian Exp $
10+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.30 1996/11/20 22:34:36 momjian Exp $
1111 *
1212 *-------------------------------------------------------------------------
1313 */
@@ -475,6 +475,7 @@ SendQuery(bool * success_p, PsqlSettings * settings, const char *query,
475475pclose (fp );
476476else
477477fclose (fp );
478+ free (settings -> gfname );
478479settings -> gfname = NULL ;
479480break ;
480481 }else {
@@ -1011,7 +1012,11 @@ HandleSlashCmds(PsqlSettings * settings,
10111012if (settings -> opt .caption )
10121013free (settings -> opt .caption );
10131014if (!optarg )
1015+ {
1016+ if (settings -> opt .caption )
1017+ free (settings -> opt .caption );
10141018settings -> opt .caption = NULL ;
1019+ }
10151020else if (!(settings -> opt .caption = strdup (optarg ))) {
10161021perror ("malloc" );
10171022exit (1 );
@@ -1083,7 +1088,7 @@ HandleSlashCmds(PsqlSettings * settings,
10831088if (optarg )
10841089fs = optarg ;
10851090if (settings -> opt .fieldSep );
1086- free (settings -> opt .fieldSep );
1091+ free (settings -> opt .fieldSep );
10871092if (!(settings -> opt .fieldSep = strdup (fs ))) {
10881093perror ("malloc" );
10891094exit (1 );
@@ -1093,7 +1098,7 @@ HandleSlashCmds(PsqlSettings * settings,
10931098break ;
10941099}
10951100case 'g' :/* \g means send query */
1096- settings -> gfname = optarg ;
1101+ settings -> gfname = strdup ( optarg ) ;
10971102status = 0 ;
10981103break ;
10991104case 'h' :/* help */
@@ -1151,12 +1156,14 @@ HandleSlashCmds(PsqlSettings * settings,
11511156if (toggle (settings ,& settings -> opt .standard ,"standard SQL separaters and padding" )) {
11521157settings -> opt .html3 = settings -> opt .expanded = 0 ;
11531158settings -> opt .align = settings -> opt .header = 1 ;
1154- free (settings -> opt .fieldSep );
1159+ if (settings -> opt .fieldSep )
1160+ free (settings -> opt .fieldSep );
11551161settings -> opt .fieldSep = strdup ("|" );
11561162if (!settings -> quiet )
11571163fprintf (stderr ,"field separater changed to '%s'\n" ,settings -> opt .fieldSep );
11581164}else {
1159- free (settings -> opt .fieldSep );
1165+ if (settings -> opt .fieldSep )
1166+ free (settings -> opt .fieldSep );
11601167settings -> opt .fieldSep = strdup (DEFAULT_FIELD_SEP );
11611168if (!settings -> quiet )
11621169fprintf (stderr ,"field separater changed to '%s'\n" ,settings -> opt .fieldSep );