Add missing check_stack_depth() to some recursive functions

Reported-by: Egor Chindyaskin, Alexander Lakhin
Discussion: https://postgr.es/m/1672760457.940462079%40f306.i.mail.ru
This commit is contained in:
Alexander Korotkov 2024-02-16 16:02:00 +02:00
parent eb49e1bdd9
commit d57b7cc333
5 changed files with 30 additions and 0 deletions

View File

@ -76,6 +76,7 @@
#include "commands/trigger.h" #include "commands/trigger.h"
#include "commands/typecmds.h" #include "commands/typecmds.h"
#include "funcapi.h" #include "funcapi.h"
#include "miscadmin.h"
#include "nodes/nodeFuncs.h" #include "nodes/nodeFuncs.h"
#include "parser/parsetree.h" #include "parser/parsetree.h"
#include "rewrite/rewriteRemove.h" #include "rewrite/rewriteRemove.h"
@ -524,6 +525,12 @@ findDependentObjects(const ObjectAddress *object,
if (stack_address_present_add_flags(object, objflags, stack)) if (stack_address_present_add_flags(object, objflags, stack))
return; 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 * It's also possible that the target object has already been completely
* processed and put into targetObjects. If so, again we just add the * processed and put into targetObjects. If so, again we just add the

View File

@ -552,6 +552,9 @@ CheckAttributeType(const char *attname,
char att_typtype = get_typtype(atttypid); char att_typtype = get_typtype(atttypid);
Oid att_typelem; Oid att_typelem;
/* since this function recurses, it could be driven to stack overflow */
check_stack_depth();
if (att_typtype == TYPTYPE_PSEUDO) if (att_typtype == TYPTYPE_PSEUDO)
{ {
/* /*

View File

@ -7035,6 +7035,9 @@ ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel,
ObjectAddress address; ObjectAddress address;
TupleDesc tupdesc; TupleDesc tupdesc;
/* 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 */ /* At top level, permission check was done in ATPrepCmd, else do it */
if (recursing) if (recursing)
ATSimplePermissions((*cmd)->subtype, rel, ATT_TABLE | ATT_FOREIGN_TABLE); ATSimplePermissions((*cmd)->subtype, rel, ATT_TABLE | ATT_FOREIGN_TABLE);
@ -9083,6 +9086,10 @@ ATExecDropColumn(List **wqueue, Relation rel, const char *colName,
/* Initialize addrs on the first invocation */ /* Initialize addrs on the first invocation */
Assert(!recursing || addrs != NULL); Assert(!recursing || addrs != NULL);
/* since this function recurses, it could be driven to stack overflow */
check_stack_depth();
if (!recursing) if (!recursing)
addrs = new_object_addresses(); addrs = new_object_addresses();
@ -11636,6 +11643,9 @@ ATExecAlterConstrRecurse(Constraint *cmdcon, Relation conrel, Relation tgrel,
Oid refrelid; Oid refrelid;
bool changed = false; bool changed = false;
/* since this function recurses, it could be driven to stack overflow */
check_stack_depth();
currcon = (Form_pg_constraint) GETSTRUCT(contuple); currcon = (Form_pg_constraint) GETSTRUCT(contuple);
conoid = currcon->oid; conoid = currcon->oid;
refrelid = currcon->confrelid; refrelid = currcon->confrelid;
@ -12716,6 +12726,9 @@ dropconstraint_internal(Relation rel, HeapTuple constraintTup, DropBehavior beha
/* Guard against stack overflow due to overly deep inheritance tree. */ /* Guard against stack overflow due to overly deep inheritance tree. */
check_stack_depth(); check_stack_depth();
/* 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 */ /* At top level, permission check was done in ATPrepCmd, else do it */
if (recursing) if (recursing)
ATSimplePermissions(AT_DropConstraint, rel, ATT_TABLE | ATT_FOREIGN_TABLE); ATSimplePermissions(AT_DropConstraint, rel, ATT_TABLE | ATT_FOREIGN_TABLE);

View File

@ -2423,6 +2423,10 @@ static Node *
eval_const_expressions_mutator(Node *node, eval_const_expressions_mutator(Node *node,
eval_const_expressions_context *context) eval_const_expressions_context *context)
{ {
/* since this function recurses, it could be driven to stack overflow */
check_stack_depth();
if (node == NULL) if (node == NULL)
return NULL; return NULL;
switch (nodeTag(node)) switch (nodeTag(node))

View File

@ -1674,6 +1674,9 @@ executeBoolItem(JsonPathExecContext *cxt, JsonPathItem *jsp,
JsonPathBool res; JsonPathBool res;
JsonPathBool res2; JsonPathBool res2;
/* since this function recurses, it could be driven to stack overflow */
check_stack_depth();
if (!canHaveNext && jspHasNext(jsp)) if (!canHaveNext && jspHasNext(jsp))
elog(ERROR, "boolean jsonpath item cannot have next item"); elog(ERROR, "boolean jsonpath item cannot have next item");