fix(dicom): null-check DCMTK pixel-data accessors before use - #5364
Merged
Conversation
DicomImage::getInterData() and getOutputData() can return null when a corrupt DICOM's frame fails to decode, but their results were used without checking: getInterData() is immediately dereferenced via getData()/getRepresentation(), and getOutputData()'s pointer is stored and later memcpy'd in read_native_scanline(). The only guard was an OIIO_DASSERT, which compiles out in release builds, leaving a null-pointer dereference on malformed input. Check both and error cleanly. Assisted-by: Claude Code / Claude Opus 4.8 Signed-off-by: Larry Gritz <lg@larrygritz.com>
jinhgkim
approved these changes
Aug 8, 2026
jinhgkim
left a comment
jinhgkim
left a comment
Collaborator
There was a problem hiding this comment.
LGTM, just a few nits I encountered while reviewing...
Collaborator
There was a problem hiding this comment.
nit: redundant, already set in close()
| m_img.reset(); | ||
| return false; | ||
| } | ||
| m_internal_data = (const char*)m_dipixel->getData(); |
Collaborator
There was a problem hiding this comment.
nit: this assignment can be removed since it's being overwritten by line 204.
Collaborator
Author
There was a problem hiding this comment.
Thanks for those patches, which were not lines changed by this PR, but have been there for many years!
Signed-off-by: Larry Gritz <lg@larrygritz.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
DicomImage::getInterData() and getOutputData() can return null when a corrupt DICOM's frame fails to decode, but their results were used without checking.
Assisted-by: Claude Code / Claude Opus 4.8