Make GetSlotInvalidationCause() return RS_INVAL_NONE on unexpected input

michaelpq · michaelpq · commit efa70c15c742 · 2024-02-22T19:59:58.000+09:00
943f7ae has changed GetSlotInvalidationCause() so as it would return the last element of SlotInvalidationCauses[] when an incorrect conflict reason name is given by a caller, but this should return RS_INVAL_NONE in such cases, even if such a state should never be reached in practice. Per gripe from Peter Smith. Reviewed-by: Bharath Rupireddy Discussion: https://postgr.es/m/CAHut+PtsrSWxczpGkSaSVtJo+BXrvJ3Hwp5gES14bbL-G+HL7A@mail.gmail.com
diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c
@@ -2327,6 +2327,7 @@ ReplicationSlotInvalidationCause
 GetSlotInvalidationCause(const char *conflict_reason)
 {
 	ReplicationSlotInvalidationCause cause;
+	ReplicationSlotInvalidationCause result = RS_INVAL_NONE;
 	bool		found PG_USED_FOR_ASSERTS_ONLY = false;
 
 	Assert(conflict_reason);
@@ -2336,10 +2337,11 @@ GetSlotInvalidationCause(const char *conflict_reason)
 		if (strcmp(SlotInvalidationCauses[cause], conflict_reason) == 0)
 		{
 			found = true;
+			result = cause;
 			break;
 		}
 	}
 
 	Assert(found);
-	return cause;
+	return result;
 }

Original file line number	Diff line number	Diff line change
`@@ -2327,6 +2327,7 @@ ReplicationSlotInvalidationCause`
`2327`	`2327`	`GetSlotInvalidationCause(const char *conflict_reason)`
`2328`	`2328`	`{`
`2329`	`2329`	`ReplicationSlotInvalidationCause cause;`
	`2330`	`+ ReplicationSlotInvalidationCause result = RS_INVAL_NONE;`
`2330`	`2331`	`bool found PG_USED_FOR_ASSERTS_ONLY = false;`
`2331`	`2332`
`2332`	`2333`	`Assert(conflict_reason);`
`@@ -2336,10 +2337,11 @@ GetSlotInvalidationCause(const char *conflict_reason)`
`2336`	`2337`	`if (strcmp(SlotInvalidationCauses[cause], conflict_reason) == 0)`
`2337`	`2338`	`{`
`2338`	`2339`	`found = true;`
	`2340`	`+ result = cause;`
`2339`	`2341`	`break;`
`2340`	`2342`	`}`
`2341`	`2343`	`}`
`2342`	`2344`
`2343`	`2345`	`Assert(found);`
`2344`		`- return cause;`
	`2346`	`+ return result;`
`2345`	`2347`	`}`