From 8899a2aba92c4a17f422172e7c9dd0e383eefa39 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 24 Mar 2004 22:40:29 +0000 Subject: Replace max_expr_depth parameter with a max_stack_depth parameter that is measured in kilobytes and checked against actual physical execution stack depth, as per my proposal of 30-Dec. This gives us a fairly bulletproof defense against crashing due to runaway recursive functions. --- src/backend/optimizer/util/clauses.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/backend/optimizer/util') diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index c006cd49a1f..b05f760ade2 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.166 2004/03/21 22:29:11 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.167 2004/03/24 22:40:28 tgl Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -2347,6 +2347,10 @@ expression_tree_walker(Node *node, */ if (node == NULL) return false; + + /* Guard against stack overflow due to overly complex expressions */ + check_stack_depth(); + switch (nodeTag(node)) { case T_Var: @@ -2720,6 +2724,10 @@ expression_tree_mutator(Node *node, if (node == NULL) return NULL; + + /* Guard against stack overflow due to overly complex expressions */ + check_stack_depth(); + switch (nodeTag(node)) { case T_Var: -- cgit v1.2.3