Rebase to master - fix-up memory allocation and access mistakes

gurjeet · gurjeet · commit 5e5ccb486d43 · 2023-09-13T21:21:19.000Z
There was an unnecessary allocation, and removing that exposed the
unnecessary indirection of a pointer value.

The use of malloc in Postgres is restricted to very few places, and
since the GUC checking and setting code has a dedicated memory context,
use guc_malloc() for memory allocations.
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
@@ -1293,17 +1293,14 @@ check_password_duration(char **newval, void **extra, GucSource source)
 		return false;
 	}
 
-	new_interval = malloc(sizeof(Interval));
+	new_interval = guc_malloc(LOG, sizeof(Interval));
 	memcpy(new_interval, interval, sizeof(Interval));
 	pfree(interval);
 
 	/*
 	 * Pass back data for assign_password_validity to use
 	 */
-	*extra = malloc(sizeof(Interval *));
-	if (!*extra)
-		return false;
-	*((Interval **) *extra) = new_interval;
+	*extra = (void*) new_interval;
 
 	return true;
 }
@@ -1317,7 +1314,7 @@ assign_password_duration(const char *newval, void *extra)
 	if (extra == NULL)
 		default_password_duration = NULL;
 	else
-		default_password_duration = *((Interval **) extra);
+		default_password_duration = (Interval *) extra;
 }
 
 /*
