Add missing RestrictSearchPath() calls.

jeff-davis · jeff-davis · commit 8e28778ce396 · 2024-07-15T12:07:35.000-07:00
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
@@ -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();
 			}
 
 			/*

Original file line number	Diff line number	Diff line change
`@@ -1230,6 +1230,7 @@ DefineIndex(Oid tableId,`
`1230`	`1230`	`*/`
`1231`	`1231`	`AtEOXact_GUC(false, root_save_nestlevel);`
`1232`	`1232`	`root_save_nestlevel = NewGUCNestLevel();`
	`1233`	`+ RestrictSearchPath();`
`1233`	`1234`
`1234`	`1235`	`/* Add any requested comment */`
`1235`	`1236`	`if (stmt->idxcomment != NULL)`
`@@ -2027,6 +2028,7 @@ ComputeIndexAttrs(IndexInfo *indexInfo,`
`2027`	`2028`	`{`
`2028`	`2029`	`SetUserIdAndSecContext(save_userid, save_sec_context);`
`2029`	`2030`	`*ddl_save_nestlevel = NewGUCNestLevel();`
	`2031`	`+ RestrictSearchPath();`
`2030`	`2032`	`}`
`2031`	`2033`	`}`
`2032`	`2034`
`@@ -2074,6 +2076,7 @@ ComputeIndexAttrs(IndexInfo *indexInfo,`
`2074`	`2076`	`{`
`2075`	`2077`	`SetUserIdAndSecContext(save_userid, save_sec_context);`
`2076`	`2078`	`*ddl_save_nestlevel = NewGUCNestLevel();`
	`2079`	`+ RestrictSearchPath();`
`2077`	`2080`	`}`
`2078`	`2081`
`2079`	`2082`	`/*`
`@@ -2104,6 +2107,7 @@ ComputeIndexAttrs(IndexInfo *indexInfo,`
`2104`	`2107`	`{`
`2105`	`2108`	`SetUserIdAndSecContext(save_userid, save_sec_context);`
`2106`	`2109`	`*ddl_save_nestlevel = NewGUCNestLevel();`
	`2110`	`+ RestrictSearchPath();`
`2107`	`2111`	`}`
`2108`	`2112`
`2109`	`2113`	`/*`