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

tglsfdc · tglsfdc · commit 18feafcc59d8 · 2005-10-24T15:10:22.000Z
one CHECK_FOR_INTERRUPTS() call, so that you can control-C out of the
loop.  Reported by Merlin Moncure.
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
@@ -3,7 +3,7 @@
  *			  procedural language
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.153 2005/10/15 02:49:49 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.154 2005/10/24 15:10:22 tgl Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -974,6 +974,17 @@ exec_stmts(PLpgSQL_execstate * estate, List *stmts)
 {
 	ListCell   *s;
 
+	if (stmts == NIL)
+	{
+		/*
+		 * Ensure we do a CHECK_FOR_INTERRUPTS() even though there is no
+		 * statement.  This prevents hangup in a tight loop if, for instance,
+		 * there is a LOOP construct with an empty body.
+		 */
+		CHECK_FOR_INTERRUPTS();
+		return PLPGSQL_RC_OK;
+	}
+
 	foreach(s, stmts)
 	{
 		PLpgSQL_stmt *stmt = (PLpgSQL_stmt *) lfirst(s);

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`	`+ return PLPGSQL_RC_OK;`
	`986`	`+ }`
	`987`	`+`
`977`	`988`	`foreach(s, stmts)`
`978`	`989`	`{`
`979`	`990`	`PLpgSQL_stmt stmt = (PLpgSQL_stmt ) lfirst(s);`