Add missing RestrictSearchPath() calls.

Reported-by: Noah Misch
Backpatch-through: 17
Discussion: https://postgr.es/m/20240630222344.db.nmisch@google.com

diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 2caab88aa58024ae8ca766eeb45fb8e9fa415ec8..c5a56c75f699521a85be73511ac4931c0e13e9b1 100644 (file)
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -1230,6 +1230,7 @@ DefineIndex(Oid tableId,
         */
        AtEOXact_GUC(false, root_save_nestlevel);
        root_save_nestlevel = NewGUCNestLevel();
+       RestrictSearchPath();
 
        /* Add any requested comment */
        if (stmt->idxcomment != NULL)
@@ -2027,6 +2028,7 @@ ComputeIndexAttrs(IndexInfo *indexInfo,
                        {
                                SetUserIdAndSecContext(save_userid, save_sec_context);
                                *ddl_save_nestlevel = NewGUCNestLevel();
+                               RestrictSearchPath();
                        }
                }
 
@@ -2074,6 +2076,7 @@ ComputeIndexAttrs(IndexInfo *indexInfo,
                {
                        SetUserIdAndSecContext(save_userid, save_sec_context);
                        *ddl_save_nestlevel = NewGUCNestLevel();
+                       RestrictSearchPath();
                }
 
                /*
@@ -2104,6 +2107,7 @@ ComputeIndexAttrs(IndexInfo *indexInfo,
                        {
                                SetUserIdAndSecContext(save_userid, save_sec_context);
                                *ddl_save_nestlevel = NewGUCNestLevel();
+                               RestrictSearchPath();
                        }
 
                        /*