Fix attach of a previously-detached injection point.

nmisch · nmisch · commit a36aa223ec44 · 2024-08-22T00:07:04.000-07:00
It's normal for the name in a free slot to match the new name.  The
max_inuse mechanism kept simple cases from reaching the problem.  The
problem could appear when index 0 was the previously-detached entry and
index 1 is in use.  Back-patch to v17, where this code first appeared.
diff --git a/src/backend/utils/misc/injection_point.c b/src/backend/utils/misc/injection_point.c
@@ -315,8 +315,7 @@ InjectionPointAttach(const char *name,
 			if (free_idx == -1)
 				free_idx = idx;
 		}
-
-		if (strcmp(entry->name, name) == 0)
+		else if (strcmp(entry->name, name) == 0)
 			elog(ERROR, "injection point \"%s\" already defined", name);
 	}
 	if (free_idx == -1)

Original file line number	Diff line number	Diff line change
`@@ -315,8 +315,7 @@ InjectionPointAttach(const char *name,`
`315`	`315`	`if (free_idx == -1)`
`316`	`316`	`free_idx = idx;`
`317`	`317`	`}`
`318`		`-`
`319`		`- if (strcmp(entry->name, name) == 0)`
	`318`	`+ else if (strcmp(entry->name, name) == 0)`
`320`	`319`	`elog(ERROR, "injection point \"%s\" already defined", name);`
`321`	`320`	`}`
`322`	`321`	`if (free_idx == -1)`