Skip to content

Fix potential out-of-bounds access in TimeFilter #2532

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
paulromano merged 2 commits into from
Jun 11, 2023
Merged

Fix potential out-of-bounds access in TimeFilter #2532

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24d536f
Make sure time is not out of bounds in TimeFilter for collision/surface
paulromano May 23, 2023
6e4a119
Combine if with previous else
paulromano Jun 2, 2023
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
Prev Previous commit
Combine if with previous else
  • Loading branch information
@paulromano
paulromano committed Jun 2, 2023
commit 6e4a119b1e162389f66c45b7393bc3a27f8acaf2
11 changes: 5 additions & 6 deletions src/tallies/filter_time.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,14 @@ void TimeFilter::get_all_bins(
if (t_end < bins_[i_bin + 1])
break;
}
} else {
} else if (t_end < bins_.back()) {
// -------------------------------------------------------------------------
// For collision estimator or surface tallies, find a match based on the
// exact time of the particle
if (t_end < bins_.back()) {
const auto i_bin = lower_bound_index(bins_.begin(), bins_.end(), t_end);
match.bins_.push_back(i_bin);
match.weights_.push_back(1.0);
}

const auto i_bin = lower_bound_index(bins_.begin(), bins_.end(), t_end);
match.bins_.push_back(i_bin);
match.weights_.push_back(1.0);
}
}

Expand Down