@@ -62,7 +62,7 @@ main(int argc, char *argv[])
6262enum trivalue prompt_password = TRI_DEFAULT ;
6363bool echo = false;
6464bool interactive = false;
65- char * conn_limit = NULL ;
65+ int conn_limit = -2 ; /* less than minimum valid value */
6666bool pwprompt = false;
6767char * newpassword = NULL ;
6868
@@ -88,6 +88,8 @@ main(int argc, char *argv[])
8888while ((c = getopt_long (argc ,argv ,"h:p:U:g:wWedDsSaArRiIlLc:PEN" ,
8989long_options ,& optindex ))!= -1 )
9090{
91+ char * endptr ;
92+
9193switch (c )
9294{
9395case 'h' :
@@ -144,7 +146,14 @@ main(int argc, char *argv[])
144146login = TRI_NO ;
145147break ;
146148case 'c' :
147- conn_limit = pg_strdup (optarg );
149+ conn_limit = strtol (optarg ,& endptr ,10 );
150+ if (* endptr != '\0' || conn_limit < -1 )/* minimum valid value */
151+ {
152+ fprintf (stderr ,
153+ _ ("%s: invalid value for --connection-limit: %s\n" ),
154+ progname ,optarg );
155+ exit (1 );
156+ }
148157break ;
149158case 'P' :
150159pwprompt = true;
@@ -305,8 +314,8 @@ main(int argc, char *argv[])
305314appendPQExpBufferStr (& sql ," REPLICATION" );
306315if (replication == TRI_NO )
307316appendPQExpBufferStr (& sql ," NOREPLICATION" );
308- if (conn_limit != NULL )
309- appendPQExpBuffer (& sql ," CONNECTION LIMIT %s " ,conn_limit );
317+ if (conn_limit >= -1 )
318+ appendPQExpBuffer (& sql ," CONNECTION LIMIT %d " ,conn_limit );
310319if (roles .head != NULL )
311320{
312321SimpleStringListCell * cell ;