Fix type of iterator variable in SH_START_ITERATE

anarazel · anarazel · commit 6143602ebaab · 2023-07-06T09:57:33.000-07:00
Also add comment to make the reasoning behind the Assert() more explicit (per Tom). Reported-by: Ranier Vilela Discussion: https://postgr.es/m/CAEudQAocXNJ6s1VLz+hMamLAQAiewRoW17OJ6-+9GACKfj6iPQ@mail.gmail.com Backpatch: 11-
diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h
@@ -760,7 +760,7 @@ SH_DELETE(SH_TYPE * tb, SH_KEY_TYPE key)
 SH_SCOPE void
 SH_START_ITERATE(SH_TYPE * tb, SH_ITERATOR * iter)
 {
-	int			i;
+	uint32		i;
 	uint64		startelem = PG_UINT64_MAX;
 
 	/*
@@ -779,6 +779,7 @@ SH_START_ITERATE(SH_TYPE * tb, SH_ITERATOR * iter)
 		}
 	}
 
+	/* we should have found an empty element */
 	Assert(startelem < SH_MAX_SIZE);
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -760,7 +760,7 @@ SH_DELETE(SH_TYPE * tb, SH_KEY_TYPE key)`
`760`	`760`	`SH_SCOPE void`
`761`	`761`	`SH_START_ITERATE(SH_TYPE * tb, SH_ITERATOR * iter)`
`762`	`762`	`{`
`763`		`- int i;`
	`763`	`+ uint32 i;`
`764`	`764`	`uint64 startelem = PG_UINT64_MAX;`
`765`	`765`
`766`	`766`	`/*`
`@@ -779,6 +779,7 @@ SH_START_ITERATE(SH_TYPE * tb, SH_ITERATOR * iter)`
`779`	`779`	`}`
`780`	`780`	`}`
`781`	`781`
	`782`	`+ /* we should have found an empty element */`
`782`	`783`	`Assert(startelem < SH_MAX_SIZE);`
`783`	`784`
`784`	`785`	`/*`