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

Jump to bottom

Fix undefined behaviour from unthrown error #656

Merged
merged 2 commits into from
Aug 15, 2023
Merged

Fix undefined behaviour from unthrown error #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f796e4d
Fix undefined behaviour from unthrown error
ndevenish Aug 15, 2023
feed6bf
Rename newsfragments/XXX.bugfix to newsfragments/656.bugfix
DiamondLightSource-build-server Aug 15, 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
1 change: 1 addition & 0 deletions newsfragments/656.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix situation where a bad ``Beam.probe`` could cause undefined behaviour.
4 changes: 2 additions & 2 deletions src/dxtbx/model/beam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ namespace dxtbx { namespace model {
case neutron:
return std::string("neutron");
default:
DXTBX_ERROR("Unknown probe type");
throw DXTBX_ERROR("Unknown probe type");
}
}

Expand All @@ -335,7 +335,7 @@ namespace dxtbx { namespace model {
return Probe::neutron;
}

DXTBX_ERROR("Unknown probe " + probe);
throw DXTBX_ERROR("Unknown probe " + probe);
}

void set_probe(Probe probe) {
Expand Down
Loading