Commit18feafc

committed

Ensure that a plpgsql LOOP with an empty body still executes at least

one CHECK_FOR_INTERRUPTS() call, so that you can control-C out of theloop. Reported by Merlin Moncure.

1 parent7d3ab8a commit18feafcCopy full SHA for 18feafc

File tree

+12

-1

lines changed

+12

-1

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* procedural language`
`4`	`4`	`*`
`5`	`5`	`* IDENTIFICATION`
`6`		`- * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.153 2005/10/15 02:49:49 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.154 2005/10/24 15:10:22 tgl Exp $`
`7`	`7`	`*`
`8`	`8`	`* This software is copyrighted by Jan Wieck - Hamburg.`
`9`	`9`	`*`
`@@ -974,6 +974,17 @@ exec_stmts(PLpgSQL_execstate * estate, List *stmts)`
`974`	`974`	`{`
`975`	`975`	`ListCell*s;`
`976`	`976`
	`977`	`+if (stmts==NIL)`
	`978`	`+{`
	`979`	`+/*`
	`980`	`+ * Ensure we do a CHECK_FOR_INTERRUPTS() even though there is no`
	`981`	`+ * statement. This prevents hangup in a tight loop if, for instance,`
	`982`	`+ * there is a LOOP construct with an empty body.`
	`983`	`+ */`
	`984`	`+CHECK_FOR_INTERRUPTS();`
	`985`	`+returnPLPGSQL_RC_OK;`
	`986`	`+}`
	`987`	`+`
`977`	`988`	`foreach(s,stmts)`
`978`	`989`	`{`
`979`	`990`	`PLpgSQL_stmtstmt= (PLpgSQL_stmt)lfirst(s);`

Comments

(0)