Fix segfaults from PvodeSolver #1926
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Not sure how this worked when I checked it before... Turns out |
Solver::init() sets Solver::initialised=true. The destructor PvodeSolver::~PvodeSolver() previously used initialised to check if it should free memory. Solver::init() is called near the start of PvodeSolver::init(), so Solver::initialised is set to true before PvodeSolver has completed initialisation. An error during the initialisation (which is not unlikely, as CvodeMalloc calls the rhs function!) could then cause a segfault as the destructor free'd memory that had not been fully allocated. Using a separate pvode_initialised flag, which is set to true only at the end of PvodeSolver::init() fixes this issue.
johnomotani
force-pushed
the
pvode-segfault-fix
branch
from
6b9337f
to
810ec3d
Compare
CvodeSolver shares a similar structure, so potentially could have caused a similar segfault.
johnomotani
added
the
backport candidiate
ZedThree
approved these changes
Mar 2, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Solver::init()setsSolver::initialised=true. The destructorPvodeSolver::~PvodeSolver()usesinitialisedto check if it should free memory. Previously,Solver::init()was called near the start ofPvodeSolver::init(), but this meant thatSolver::initialisedwas set to true before thePvodeSolverhad completed initialisation. An error during the initialisation (which is not unlikely, asCvodeMalloccalls the rhs function!) could then cause a segfault as the destructor free'd memory that had not been fully allocated. CallingSolver::init()at the end ofPvodeSolver::init()ensuresSolver::initialisedis not set untilPvodeSolverreally is fully initialised.This fixes the segfault @johnomotani reported in #1923.