Backpatch missing check_stack_depth() to some recursive functions

Backpatch changes from d57b7cc333, 75bcba6cbd to all supported branches per
proposal of Egor Chindyaskin.

Discussion: https://postgr.es/m/DE5FD776-A8CD-4378-BCFA-3BF30F1F6D60%40mail.ru

diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
index 404ced126b70a56d96964ce8f673e266b001a913..cd0015d13d2c7b488505f387e79c31b1f9c75de9 100644 (file)
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@ -71,6 +71,7 @@
 #include "commands/sequence.h"
 #include "commands/trigger.h"
 #include "commands/typecmds.h"
+#include "miscadmin.h"
 #include "nodes/nodeFuncs.h"
 #include "parser/parsetree.h"
 #include "rewrite/rewriteRemove.h"
@@ -508,6 +509,12 @@ findDependentObjects(const ObjectAddress *object,
    if (stack_address_present_add_flags(object, objflags, stack))
        return;
 
+   /*
+    * since this function recurses, it could be driven to stack overflow,
+    * because of the deep dependency tree, not only due to dependency loops.
+    */
+   check_stack_depth();
+
    /*
     * It's also possible that the target object has already been completely
     * processed and put into targetObjects.  If so, again we just add the

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index bcf7d4c28defa94f83f64c94b55ca8f9ba8d3951..ac772069cf7b1ccc0fd0b5c3305cf38e60e7dfba 100644 (file)
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -595,6 +595,9 @@ CheckAttributeType(const char *attname,
    char        att_typtype = get_typtype(atttypid);
    Oid         att_typelem;
 
+   /* since this function recurses, it could be driven to stack overflow */
+   check_stack_depth();
+
    if (att_typtype == TYPTYPE_PSEUDO)
    {
        /*

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 6158ddddbcd3d88db3d7d98b5d4c7a4fb8efc169..1dff4c3529bbf7f66aa693918fe10daf11d40c53 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -6567,6 +6567,9 @@ ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel,
    TupleDesc   tupdesc;
    FormData_pg_attribute *aattr[] = {&attribute};
 
+   /* since this function recurses, it could be driven to stack overflow */
+   check_stack_depth();
+
    /* At top level, permission check was done in ATPrepCmd, else do it */
    if (recursing)
        ATSimplePermissions(rel, ATT_TABLE | ATT_FOREIGN_TABLE);
@@ -8324,6 +8327,10 @@ ATExecDropColumn(List **wqueue, Relation rel, const char *colName,
 
    /* Initialize addrs on the first invocation */
    Assert(!recursing || addrs != NULL);
+
+   /* since this function recurses, it could be driven to stack overflow */
+   check_stack_depth();
+
    if (!recursing)
        addrs = new_object_addresses();
 
@@ -10479,6 +10486,9 @@ ATExecAlterConstrRecurse(Constraint *cmdcon, Relation conrel, Relation tgrel,
    Oid         refrelid;
    bool        changed = false;
 
+   /* since this function recurses, it could be driven to stack overflow */
+   check_stack_depth();
+
    currcon = (Form_pg_constraint) GETSTRUCT(contuple);
    conoid = currcon->oid;
    refrelid = currcon->confrelid;
@@ -11463,6 +11473,9 @@ ATExecDropConstraint(Relation rel, const char *constrName,
    bool        is_no_inherit_constraint = false;
    char        contype;
 
+   /* since this function recurses, it could be driven to stack overflow */
+   check_stack_depth();
+
    /* At top level, permission check was done in ATPrepCmd, else do it */
    if (recursing)
        ATSimplePermissions(rel, ATT_TABLE | ATT_FOREIGN_TABLE);

diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 723fb8681620064e9d8880e257178726b95440ca..bd332ab052e86aef75665d23c0e1058ccfe17302 100644 (file)
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -2302,6 +2302,10 @@ static Node *
 eval_const_expressions_mutator(Node *node,
                               eval_const_expressions_context *context)
 {
+
+   /* since this function recurses, it could be driven to stack overflow */
+   check_stack_depth();
+
    if (node == NULL)
        return NULL;
    switch (nodeTag(node))

diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
index ae1a9f86052dc99316e02ee5e2241038f601fb37..10ec66c6293765eeb934bec1bb307dcb4458b7a3 100644 (file)
--- a/src/backend/utils/adt/jsonpath_exec.c
+++ b/src/backend/utils/adt/jsonpath_exec.c
@@ -1231,6 +1231,9 @@ executeBoolItem(JsonPathExecContext *cxt, JsonPathItem *jsp,
    JsonPathBool res;
    JsonPathBool res2;
 
+   /* since this function recurses, it could be driven to stack overflow */
+   check_stack_depth();
+
    if (!canHaveNext && jspHasNext(jsp))
        elog(ERROR, "boolean jsonpath item cannot have next item");