From a01f2a2edbd17a1853da29d0a9dc2ea969446ec4 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Tue, 14 Mar 2023 09:21:32 +0900 Subject: [PATCH v8 1/2] Fix incorrect argument handling in psql \watch Incorrectly parsed argument was silently substituted with 1 second. This is changed to proper error message. Authour: Andrey Borodin Reviewed-by: Kyotaro Horiguchi Reviewed-by: Nathan Bossart Reviewed-by: Michael Paquier Thread: https://postgr.es/m/CAAhFRxiZ2-n_L1ErMm9AZjgmUK%3DqS6VHb%2B0SaMn8sqqbhF7How%40mail.gmail.com --- src/bin/psql/command.c | 16 +++++++++++++--- src/bin/psql/t/001_basic.pl | 17 +++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 955397ee9d..cd4c9bfd07 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -2776,9 +2776,16 @@ exec_command_watch(PsqlScanState scan_state, bool active_branch, /* Convert optional sleep-length argument */ if (opt) { - sleep = strtod(opt, NULL); - if (sleep <= 0) - sleep = 1; + char *opt_end; + sleep = strtod(opt, &opt_end); + if (sleep < 0 || *opt_end || errno == ERANGE) + { + pg_log_error("\\watch: incorrect interval value '%s'", opt); + free(opt); + resetPQExpBuffer(query_buf); + psql_scan_reset(scan_state); + return PSQL_CMD_ERROR; + } free(opt); } @@ -5183,6 +5190,9 @@ do_watch(PQExpBuffer query_buf, double sleep) if (pagerpipe && ferror(pagerpipe)) break; + if (sleep == 0) + continue; + #ifdef WIN32 /* diff --git a/src/bin/psql/t/001_basic.pl b/src/bin/psql/t/001_basic.pl index 0f394420b2..64ce012062 100644 --- a/src/bin/psql/t/001_basic.pl +++ b/src/bin/psql/t/001_basic.pl @@ -350,4 +350,21 @@ psql_like( '\copy from with DEFAULT' ); +# Check \watch errors +psql_fails_like( + $node, + 'SELECT 1;\watch -10', + qr/incorrect interval value '-10'/, + '\watch, negative interval'); +psql_fails_like( + $node, + 'SELECT 1;\watch 10ab', + qr/incorrect interval value '10ab'/, + '\watch incorrect interval'); +psql_fails_like( + $node, + 'SELECT 1;\watch 10e400', + qr/incorrect interval value '10e400'/, + '\watch out-of-range interval'); + done_testing(); -- 2.32.0 (Apple Git-132)