pgbench: fix segfault with empty sql file

alvherre · alvherre · commit db94419ffd68 · 2016-02-12T17:14:45.000-03:00
Commit 1d0c3b3 introduced a bug that causes pgbench to crash if an empty script file is specified. Fix it by rejecting such files at startup, which is the historical and intended behavior. Reported-By: Jeff Janes Discussion: https://www.postgresql.org/message-id/CAMkU=1zxKUbLPOt9hQWFp14pTc=V0cGo2GQBbn2GsK2Pu+8ZfA@mail.gmail.com
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
@@ -2686,7 +2686,8 @@ findBuiltin(const char *name, char **desc)
 static void
 addScript(const char *name, Command **commands)
 {
-	if (commands == NULL)
+	if (commands == NULL ||
+		commands[0] == NULL)
 	{
 		fprintf(stderr, "empty command list for script \"%s\"\n", name);
 		exit(1);

Original file line number	Diff line number	Diff line change
`@@ -2686,7 +2686,8 @@ findBuiltin(const char name, char *desc)`
`2686`	`2686`	`static void`
`2687`	`2687`	`addScript(const char name, Command *commands)`
`2688`	`2688`	`{`
`2689`		`- if (commands == NULL)`
	`2689`	`+ if (commands == NULL \|\|`
	`2690`	`+ commands[0] == NULL)`
`2690`	`2691`	`{`
`2691`	`2692`	`fprintf(stderr, "empty command list for script \"%s\"\n", name);`
`2692`	`2693`	`exit(1);`