Skip to content

hashtable: add bounds check in hashtableNext iterator #2611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
uriyage wants to merge 2 commits into from
+56 −6
Closed

hashtable: add bounds check in hashtableNext iterator #2611

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6df1a9a
hashtable: add bounds check in hashtableNext iterator
Sep 15, 2025
c57878c
Address PR comments
Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/hashtable.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ void hashtableSetResizePolicy(hashtableResizePolicy policy) {
#define ENTRIES_PER_BUCKET 7
#define BUCKET_BITS_TYPE uint8_t
#define BITS_NEEDED_TO_STORE_POS_WITHIN_BUCKET 3
/* Iterator table value indicating iteration is complete */
#define HASHTABLE_ITER_END_TABLE 2
Comment thread
uriyage marked this conversation as resolved.
Outdated

/* Selecting the number of buckets.
*
Expand Down Expand Up @@ -2025,6 +2027,12 @@ void hashtableReleaseIterator(hashtableIterator *iterator) {
* Returns false if there are no more entries. */
bool hashtableNext(hashtableIterator *iterator, void **elemptr) {
iter *iter = iteratorFromOpaque(iterator);

assert(iter->table <= HASHTABLE_ITER_END_TABLE);
if (iter->table == HASHTABLE_ITER_END_TABLE) {
return false;
}

while (1) {
if (iter->index == -1 && iter->table == 0) {
/* It's the first call to next. */
Expand Down Expand Up @@ -2102,6 +2110,7 @@ bool hashtableNext(hashtableIterator *iterator, void **elemptr) {
}
return true;
}
iter->table = HASHTABLE_ITER_END_TABLE;
return false;
}

Expand Down
Loading