Fix type confusion in guc_var_compare()

anarazel · anarazel · commit b9f3db23b7b5 · 2024-07-15T09:26:02.000-07:00
Before this change guc_var_compare() cast the input arguments to const struct config_generic *. That's not quite right however, as the input on one side is often just a char * on one side. Instead just use char *, the first field in config_generic. This fixes a -Warray-bounds warning with some versions of gcc. While the warning is only known to be triggered for <= 15, the issue the warning points out seems real, so apply the fix everywhere. Author: Nazir Bilal Yavuz <byavuz81@gmail.com> Reported-by: Erik Rijkers <er@xs4all.nl> Suggested-by: Andres Freund <andres@anarazel.de> Discussion: https://postgr.es/m/a74a1a0d-0fd2-3649-5224-4f754e8f91aa%40xs4all.nl
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -5721,10 +5721,10 @@ find_option(const char *name, bool create_placeholders, bool skip_errors,
 static int
 guc_var_compare(const void *a, const void *b)
 {
-	const struct config_generic *confa = *(struct config_generic *const *) a;
-	const struct config_generic *confb = *(struct config_generic *const *) b;
+	const char *namea = **(const char ** const *) a;
+	const char *nameb = **(const char ** const *) b;
 
-	return guc_name_compare(confa->name, confb->name);
+	return guc_name_compare(namea, nameb);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -5721,10 +5721,10 @@ find_option(const char *name, bool create_placeholders, bool skip_errors,`
`5721`	`5721`	`static int`
`5722`	`5722`	`guc_var_compare(const void a, const void b)`
`5723`	`5723`	`{`
`5724`		`- const struct config_generic confa = (struct config_generic const ) a;`
`5725`		`- const struct config_generic confb = (struct config_generic const ) b;`
	`5724`	`+ const char namea = (const char * const *) a;`
	`5725`	`+ const char nameb = (const char * const *) b;`
`5726`	`5726`
`5727`		`- return guc_name_compare(confa->name, confb->name);`
	`5727`	`+ return guc_name_compare(namea, nameb);`
`5728`	`5728`	`}`
`5729`	`5729`
`5730`	`5730`	`/*`