Add missing pointer dereference in pg_backend_memory_contexts view

david-rowley · david-rowley · commit da87dc07f16e · 2024-07-29T09:53:10.000+12:00
32d3ed8 moved the logic for setting the context's name and ident into a reusable function. I missed adding a pointer dereference after copying and pasting the code into that function. The ident parameter is a pointer to the ident variable in the calling function, so the dereference is required to correctly determine if the contents of that variable is NULL or not. In passing, adjust the if condition to include an == NULL to make it more clear that it's not checking for == '\0'. Reported-by: Tom Lane, Coverity Discussion: https://postgr.es/m/2256588.1722184287@sss.pgh.pa.us
diff --git a/src/backend/utils/adt/mcxtfuncs.c b/src/backend/utils/adt/mcxtfuncs.c
@@ -55,7 +55,7 @@ get_memory_context_name_and_ident(MemoryContext context, const char **const name
 	 * To be consistent with logging output, we label dynahash contexts with
 	 * just the hash table name as with MemoryContextStatsPrint().
 	 */
-	if (ident && strcmp(*name, "dynahash") == 0)
+	if (*ident == NULL && strcmp(*name, "dynahash") == 0)
 	{
 		*name = *ident;
 		*ident = NULL;

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ get_memory_context_name_and_ident(MemoryContext context, const char **const name`
`55`	`55`	`* To be consistent with logging output, we label dynahash contexts with`
`56`	`56`	`* just the hash table name as with MemoryContextStatsPrint().`
`57`	`57`	`*/`
`58`		`- if (ident && strcmp(*name, "dynahash") == 0)`
	`58`	`+ if (ident == NULL && strcmp(name, "dynahash") == 0)`
`59`	`59`	`{`
`60`	`60`	`name = ident;`
`61`	`61`	`*ident = NULL;`