database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-28 11:55:03 +03:00
Code Activity

pgbench: fix misprocessing of some nested \if constructs.

Browse Source 
An \if command appearing within a false (not-to-be-executed) \if
branch was incorrectly treated the same as \elif.  This could allow
statements within the inner \if to be executed when they should
not be.  Also the missing inner \if stack entry would result in an
assertion failure (in assert-enabled builds) when the final \endif
is reached.

Report and patch by Michail Nikolaev.  Back-patch to all
supported branches.

Discussion: https://postgr.es/m/CANtu0oiA1ke=SP6tauhNqkUdv5QFsJtS1p=aOOf_iU+EhyKkjQ@mail.gmail.com
This commit is contained in:
Tom Lane
2024-12-15 14:14:14 -05:00
parent 56499315a7
commit 530f89e648
2 changed files with 59 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/pgbench/pgbench.c
View File

@@ -3880,8 +3880,14 @@ advanceConnectionState(TState *thread, CState *st, StatsData *agg)
switch (conditional_stack_peek(st->cstack))
{
case IFSTATE_FALSE:
if (command->meta == META_IF ||
command->meta == META_ELIF)
if (command->meta == META_IF)
{
/* nested if in skipped branch - ignore */
conditional_stack_push(st->cstack,
IFSTATE_IGNORED);
st->command++;
}
else if (command->meta == META_ELIF)
{
/* we must evaluate the condition */
st->state = CSTATE_START_COMMAND;
@@ -3900,11 +3906,7 @@ advanceConnectionState(TState *thread, CState *st, StatsData *agg)
conditional_stack_pop(st->cstack);
if (conditional_active(st->cstack))
st->state = CSTATE_START_COMMAND;
/*
* else state remains in
* CSTATE_SKIP_COMMAND
*/
/* else state remains CSTATE_SKIP_COMMAND */
st->command++;
}
break;