database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-09 18:21:05 +03:00
Code

Fix handling of pgbench's hash when no argument is provided

Browse Source 
Depending on the platform used, this can cause a crash in the worst
case, or an unhelpful error message, so fail gracefully.

Author: Fabien Coelho
Discussion: https://postgr.es/m/alpine.DEB.2.21.1807262302550.29874@lancre
Backpatch: 11-, where hash() has been added in pgbench.
This commit is contained in:
Michael Paquier 2018-07-27 13:40:24 +09:00
parent 9f77ad2672
commit 39d51fe87d
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/pgbench/exprparse.y
View File

@ -467,7 +467,7 @@ make_func(yyscan_t yyscanner, int fnumber, PgBenchExprList *args)
/* hash functions with optional seed argument */
case PGBENCH_NARGS_HASH:
if (len > 2)
if (len < 1 || len > 2)
expr_yyerror_more(yyscanner, "unexpected number of arguments",
PGBENCH_FUNCTIONS[fnumber].fname);

20
src/bin/pgbench/t/002_pgbench_no_server.pl
View File

@ -270,6 +270,26 @@ my @script_tests = (
'endif syntax error',
[qr{unexpected argument in command "endif"}],
{ 'endif-bad.sql' => "\\if 0\n\\endif BAD\n" }
],
[
'not enough arguments for least',
[qr{at least one argument expected \(least\)}],
{ 'bad-least.sql' => "\\set i least()\n" }
],
[
'not enough arguments for greatest',
[qr{at least one argument expected \(greatest\)}],
{ 'bad-greatest.sql' => "\\set i greatest()\n" }
],
[
'not enough arguments for hash',
[qr{unexpected number of arguments \(hash\)}],
{ 'bad-hash-1.sql' => "\\set i hash()\n" }
],
[
'too many arguments for hash',
[qr{unexpected number of arguments \(hash\)}],
{ 'bad-hash-2.sql' => "\\set i hash(1,2,3)\n" }
],);
for my $t (@script_tests)