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
This commit is contained in:
Alexander Korotkov 2024-02-16 16:02:00 +02:00
parent 9301e0f416
commit 98bfb7558a
5 changed files with 30 additions and 0 deletions

View File

@ -73,6 +73,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"
@ -509,6 +510,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

View File

@ -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)
{
/*

View File

@ -5941,6 +5941,9 @@ ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel,
AclResult aclresult;
ObjectAddress address;
/* 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);
@ -7505,6 +7508,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();
@ -9632,6 +9639,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;
@ -10616,6 +10626,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);

View File

@ -2458,6 +2458,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))

View File

@ -1160,6 +1160,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");