MolDraw2D::drawMolecules() should not crash on null molecules #5503
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
| @@ -231,12 +232,13 @@ void MolDraw2D::drawMolecules( | |||
| drawMols_.back()->setOffsets(col * panelWidth(), row * panelHeight()); | |||
| drawMols_.back()->createDrawObjects(); | |||
| if (drawMols_.back()->getScale() < drawMols_[minScaleMol]->getScale()) { | |||
| minScaleMol = i; | |||
There was a problem hiding this comment.
Oops, sorry.
You could perhaps use drawMols_.size()-1 here rather than carrying j around. It might be a bit more immediately obvious what the intention was.
Although you probably need to change the lines just above that where it updates the rows and columns to also use j, in which case ignore the bit above.
There was a problem hiding this comment.
@DavidACosgrove Thanks for your review, I think it is a good idea and I have made the change you suggested.
e-kwsm
pushed a commit
to e-kwsm/rdkit
that referenced
this pull request
Dec 8, 2022
…5503) * MolDraw2D::drawMolecules() should not crash on null molecules * changes in response to review Co-authored-by: Tosco, Paolo <paolo.tosco@novartis.com>
e-kwsm
pushed a commit
to e-kwsm/rdkit
that referenced
this pull request
Dec 21, 2022
…5503) * MolDraw2D::drawMolecules() should not crash on null molecules * changes in response to review Co-authored-by: Tosco, Paolo <paolo.tosco@novartis.com>
e-kwsm
pushed a commit
to e-kwsm/rdkit
that referenced
this pull request
Jun 27, 2023
…5503) * MolDraw2D::drawMolecules() should not crash on null molecules * changes in response to review Co-authored-by: Tosco, Paolo <paolo.tosco@novartis.com>
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.
This bug was originally reported by Richard Lewis.
MolDraw2D::drawMolecules()under certain conditions will attempt to access non-existent vector items and hence segfault.This simple PR fixes the problem and adds a test.