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 f8a136ba0a102026a7614f34b4d5c22d9e1ed134..a94e8dbb1dcebedfe8433effb298788476c29245 100644 (file)
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@ -76,6 +76,7 @@
 #include "commands/trigger.h"
 #include "commands/typecmds.h"
 #include "funcapi.h"
+#include "miscadmin.h"
 #include "nodes/nodeFuncs.h"
 #include "parser/parsetree.h"
 #include "rewrite/rewriteRemove.h"
@@ -524,6 +525,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 9f7192210f60b1a5e65da8607d555a12c8a5bf7f..531616ef4626e95df9637473b92181180cf2d91b 100644 (file)
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -552,6 +552,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 90a5238c4d4953b19d31267f335e7d5b6ff5c31b..9cabdfe668a8540c56cd2eba8e5b03f295f8bef5 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -6802,6 +6802,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((*cmd)->subtype, rel, ATT_TABLE | ATT_FOREIGN_TABLE);
@@ -8517,6 +8520,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();
 
@@ -10974,6 +10981,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;
@@ -11981,6 +11991,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(AT_DropConstraint, rel, ATT_TABLE | ATT_FOREIGN_TABLE);

diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 8182ea59871455168847ee18804a0ab8e59e1c8f..4f3d64a4370accbb4d1e2e415b5499cafa23d4c2 100644 (file)
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -2423,6 +2423,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 2d0599b4aaae3fc8899725edf4c602986812b220..5c25bc1e4303044a71b1a66900e98999d3fc2d1a 100644 (file)
--- a/src/backend/utils/adt/jsonpath_exec.c
+++ b/src/backend/utils/adt/jsonpath_exec.c
@@ -1232,6 +1232,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");