git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

createuser: fix parsing of --connection-limit argument

author Alvaro Herrera <alvherre@alvh.no-ip.org>

2020年2月10日 15:14:58 +0000 (12:14 -0300)

committer Alvaro Herrera <alvherre@alvh.no-ip.org>

2020年2月10日 15:14:58 +0000 (12:14 -0300)

The original coding failed to quote the argument properly.

Reported-by: Daniel Gustafsson
Discussion: 1B8AE66C-85AB-4728-9BB4-612E8E61C219@yesql.se

src/bin/scripts/createuser.c patch | blob | blame | history

diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c

index 3420e62fdd9dc57c072ff109879d7c4ded6b01f2..8dde7acfb00e79bec9985886c021b7f2d23c74e9 100644 (file)

--- a/src/bin/scripts/createuser.c

+++ b/src/bin/scripts/createuser.c

@@ -62,7 +62,7 @@ main(int argc, char *argv[])

enum trivalue prompt_password = TRI_DEFAULT;

bool echo = false;

bool interactive = false;

- char *conn_limit = NULL;

+ int conn_limit = -2; /* less than minimum valid value */

bool pwprompt = false;

char *newpassword = NULL;

char newuser_buf[128];

@@ -89,6 +89,8 @@ main(int argc, char *argv[])

while ((c = getopt_long(argc, argv, "h:p:U:g:wWedDsSaArRiIlLc:PE",

long_options, &optindex)) != -1)

{

+ char *endptr;

switch (c)

{

case 'h':

@@ -145,7 +147,14 @@ main(int argc, char *argv[])

break;

case 'c':

- conn_limit = pg_strdup(optarg);

+ conn_limit = strtol(optarg, &endptr, 10);

+ if (*endptr != '0円' || conn_limit < -1) /* minimum valid value */

+ {

+ fprintf(stderr,

+ _("%s: invalid value for --connection-limit: %s\n"),

+ progname, optarg);

+ exit(1);

+ }

break;

case 'P':

pwprompt = true;

@@ -300,8 +309,8 @@ main(int argc, char *argv[])

appendPQExpBufferStr(&sql, " REPLICATION");

if (replication == TRI_NO)

appendPQExpBufferStr(&sql, " NOREPLICATION");

- if (conn_limit != NULL)

- appendPQExpBuffer(&sql, " CONNECTION LIMIT %s", conn_limit);

+ if (conn_limit >= -1)

+ appendPQExpBuffer(&sql, " CONNECTION LIMIT %d", conn_limit);

if (roles.head != NULL)

{

SimpleStringListCell *cell;

This is the main PostgreSQL git repository.

RSS Atom