From db94419ffd6833da27176f6cca843483b4515065 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Fri, 12 Feb 2016 17:14:45 -0300 Subject: [PATCH] pgbench: fix segfault with empty sql file Commit 1d0c3b3f8a 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 --- src/bin/pgbench/pgbench.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index 7eb6a2dea27..2c0a3182d34 100644 --- 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);