Skip to content

Fix UB in file_merging_iterator sentinel and is_member comparison #90

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

Merged
jermp merged 1 commit into from
Mar 10, 2026
Merged

Fix UB in file_merging_iterator sentinel and is_member comparison #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions include/builder/file_merging_iterator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ struct file_merging_iterator //
m_tree[p] = uint32_t(-1);
--m_num_files_to_merge;
}
const T inf = std::numeric_limits<T>::max();
const T inf = T::max();
while (p) {
uint64_t is_r_child = (p & 1) == 0;
uint32_t i = 0;
Expand Down Expand Up @@ -128,7 +128,7 @@ struct file_merging_iterator //
uint32_t l = build(2 * p + 1);
uint32_t r = build(2 * p + 2);
uint32_t i = 0;
const T inf = std::numeric_limits<T>::max();
const T inf = T::max();
T const* ptr_l = (l == uint32_t(-1)) ? &inf : m_iterators[l].begin;
T const* ptr_r = (r == uint32_t(-1)) ? &inf : m_iterators[r].begin;
i = (*ptr_l < *ptr_r) ? l : r;
Expand Down
4 changes: 2 additions & 2 deletions src/dictionary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ lookup_result dictionary<Kmer, Offsets>::lookup(Kmer uint_kmer,
template <typename Kmer, typename Offsets>
bool dictionary<Kmer, Offsets>::is_member(char const* string_kmer,
bool check_reverse_complement) const {
return lookup(string_kmer, check_reverse_complement) != constants::invalid_uint64;
return lookup(string_kmer, check_reverse_complement).kmer_id != constants::invalid_uint64;
}
template <typename Kmer, typename Offsets>
bool dictionary<Kmer, Offsets>::is_member(Kmer uint_kmer, bool check_reverse_complement) const {
return lookup(uint_kmer, check_reverse_complement) != constants::invalid_uint64;
return lookup(uint_kmer, check_reverse_complement).kmer_id != constants::invalid_uint64;
}

template <typename Kmer, typename Offsets>
Expand Down
Loading