Fix for \g strdup error.

bmomjian · bmomjian · commit eda3771290b1 · 1996-11-22T06:45:14.000Z
diff --git 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.31 1996/11/22 04:43:48 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.32 1996/11/22 06:45:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1099,7 +1099,12 @@ HandleSlashCmds(PsqlSettings * settings,
 	    break;
 	}
     case 'g':			/* \g means send query */
-	settings->gfname = strdup(optarg);
+	if (!optarg)
+	    settings->gfname = NULL;
+	else if (!(settings->gfname = strdup(optarg))) {
+	    perror("malloc");
+	    exit(1);
+	}
 	status = 0;
 	break;
     case 'h':			/* help */

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.31 1996/11/22 04:43:48 bryanh Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.32 1996/11/22 06:45:14 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1099,7 +1099,12 @@ HandleSlashCmds(PsqlSettings * settings,`
`1099`	`1099`	`break;`
`1100`	`1100`	`}`
`1101`	`1101`	`case 'g': /* \g means send query */`
`1102`		`- settings->gfname = strdup(optarg);`
	`1102`	`+ if (!optarg)`
	`1103`	`+ settings->gfname = NULL;`
	`1104`	`+ else if (!(settings->gfname = strdup(optarg))) {`
	`1105`	`+ perror("malloc");`
	`1106`	`+ exit(1);`
	`1107`	`+ }`
`1103`	`1108`	`status = 0;`
`1104`	`1109`	`break;`
`1105`	`1110`	`case 'h': /* help */`