Fix type confusion in guc_var_compare()

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 <[email protected]>
Reported-by: Erik Rijkers <[email protected]>
Suggested-by: Andres Freund <[email protected]>
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
index 767ef918c762b67aef79249a2640fb885628799d..0b6f2769dd9c39ca650dc834c97c6a12fd20bc6c 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -5552,10 +5552,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);
 }
 
 /*