Skip to content

fix(dicom): null-check DCMTK pixel-data accessors before use #5364

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

Merged
lgritz merged 2 commits into from
Aug 9, 2026
Merged

fix(dicom): null-check DCMTK pixel-data accessors before use #5364

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73eb177
fix(dicom): null-check DCMTK pixel-data accessors before use
lgritz Jul 26, 2026
8a95ed9
Fix a new nits found in review
lgritz Aug 9, 2026
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
16 changes: 12 additions & 4 deletions src/dicom.imageio/dicominput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,7 @@ DICOMInput::seek_subimage(int subimage, int miplevel)

if (subimage < m_subimage) {
// Want an earlier subimage, Easier to close and start again
close();
m_subimage = -1;
close(); // note: resets m_subimge to -1
}

// Open if it's not already opened
Expand Down Expand Up @@ -183,8 +182,12 @@ DICOMInput::seek_subimage(int subimage, int miplevel)
++m_subimage;
}

m_dipixel = m_img->getInterData();
m_internal_data = (const char*)m_dipixel->getData();
m_dipixel = m_img->getInterData();
if (!m_dipixel) {
errorfmt("Unable to read pixel data from DICOM file {}", m_filename);
m_img.reset();
return false;
}
EP_Representation rep = m_dipixel->getRepresentation();
TypeDesc format;
switch (rep) {
Expand All @@ -197,6 +200,11 @@ DICOMInput::seek_subimage(int subimage, int miplevel)
default: break;
}
m_internal_data = (const char*)m_img->getOutputData(0, m_subimage, 0);
if (!m_internal_data) {
errorfmt("Unable to decode pixel data from DICOM file {}", m_filename);
m_img.reset();
return false;
}

EP_Interpretation photo = m_img->getPhotometricInterpretation();
struct PhotoTable {
Expand Down
Loading