Skip to content
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

Remove null pointer dereference for GammaLaw EOS #533

Merged
merged 2 commits into from
Oct 7, 2024
Merged

Remove null pointer dereference for GammaLaw EOS #533

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d65278e
avoid nullptr deref in gammalaw
baperry2 Oct 4, 2024
6fc9a3f
Merge branch 'AMReX-Combustion:development' into null-deref
baperry2 Oct 7, 2024
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
8 changes: 4 additions & 4 deletions Source/Eos/GammaLaw.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,10 +478,10 @@ struct GammaLaw
AMREX_GPU_HOST_DEVICE
GammaLaw(const EosParm<GammaLaw>* eparm)
{
AMREX_ASSERT_WITH_MESSAGE(
eparm != nullptr,
"GammaLaw Eos initialized with eosparm, but eosparm was not initialized");
gamma = eparm->gamma;
// This should eventually error out if eparm is nullptr
// But for now we require that eparm->gamma=gamma anyway,
// and this supports some potential legacy use cases for now
gamma = (eparm != nullptr) ? eparm->gamma : gamma;
}

template <class... Args>
Expand Down
Loading