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

fix(exr): Avoid integer overflow for large deep exr slice strides #4542

Merged
merged 2 commits into from
Nov 30, 2024
Merged

fix(exr): Avoid integer overflow for large deep exr slice strides #4542

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
e8d0b4c
fix(exr): Avoid integer overflow for large deep exr slice strides
lgritz Nov 25, 2024
19469f7
Address review comments
lgritz Nov 28, 2024
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
36 changes: 19 additions & 17 deletions src/openexr.imageio/exrinput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1485,7 +1485,7 @@ OpenEXRInput::read_native_deep_scanlines(int subimage, int miplevel, int ybegin,
try {
size_t npixels = (yend - ybegin) * m_spec.width;
chend = clamp(chend, chbegin + 1, m_spec.nchannels);
int nchans = chend - chbegin;
size_t nchans = chend - chbegin;

// Set up the count and pointers arrays and the Imf framebuffer
std::vector<TypeDesc> channeltypes;
Expand All @@ -1502,16 +1502,17 @@ OpenEXRInput::read_native_deep_scanlines(int subimage, int miplevel, int ybegin,
sizeof(unsigned int),
sizeof(unsigned int) * m_spec.width);
frameBuffer.insertSampleCountSlice(countslice);
size_t slchans = m_spec.width * nchans;
size_t xstride = sizeof(void*) * nchans;
size_t ystride = sizeof(void*) * slchans;
size_t samplestride = deepdata.samplesize();

for (int c = chbegin; c < chend; ++c) {
Imf::DeepSlice slice(
part.pixeltype[c],
(char*)(&pointerbuf[0] + (c - chbegin) - m_spec.x * nchans
- ybegin * m_spec.width * nchans),
sizeof(void*) * nchans, // xstride of pointer array
sizeof(void*) * nchans
* m_spec.width, // ystride of pointer array
deepdata.samplesize()); // stride of data sample
Imf::DeepSlice slice(part.pixeltype[c],
(char*)(&pointerbuf[0] + (c - chbegin)
- m_spec.x * nchans
- ybegin * slchans),
xstride, ystride, samplestride);
frameBuffer.insert(m_spec.channelnames[c].c_str(), slice);
}
m_deep_scanline_input_part->setFrameBuffer(frameBuffer);
Expand Down Expand Up @@ -1564,7 +1565,7 @@ OpenEXRInput::read_native_deep_tiles(int subimage, int miplevel, int xbegin,
size_t height = yend - ybegin;
size_t npixels = width * height;
chend = clamp(chend, chbegin + 1, m_spec.nchannels);
int nchans = chend - chbegin;
size_t nchans = chend - chbegin;

// Set up the count and pointers arrays and the Imf framebuffer
std::vector<TypeDesc> channeltypes;
Expand All @@ -1579,14 +1580,15 @@ OpenEXRInput::read_native_deep_tiles(int subimage, int miplevel, int xbegin,
Imf::UINT, (char*)(&all_samples[0] - xbegin - ybegin * width),
sizeof(unsigned int), sizeof(unsigned int) * width);
frameBuffer.insertSampleCountSlice(countslice);
size_t slchans = width * nchans;
size_t xstride = sizeof(void*) * nchans;
size_t ystride = sizeof(void*) * slchans;
size_t samplestride = deepdata.samplesize();
for (int c = chbegin; c < chend; ++c) {
Imf::DeepSlice slice(
part.pixeltype[c],
(char*)(&pointerbuf[0] + (c - chbegin) - xbegin * nchans
- ybegin * width * nchans),
sizeof(void*) * nchans, // xstride of pointer array
sizeof(void*) * nchans * width, // ystride of pointer array
deepdata.samplesize()); // stride of data sample
Imf::DeepSlice slice(part.pixeltype[c],
(char*)(&pointerbuf[0] + (c - chbegin)
- xbegin * nchans - ybegin * slchans),
xstride, ystride, samplestride);
frameBuffer.insert(m_spec.channelnames[c].c_str(), slice);
}
m_deep_tiled_input_part->setFrameBuffer(frameBuffer);
Expand Down
40 changes: 20 additions & 20 deletions src/openexr.imageio/exroutput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1700,17 +1700,17 @@ OpenEXROutput::write_deep_scanlines(int ybegin, int yend, int /*z*/,
return false;
}

int nchans = m_spec.nchannels;
size_t nchans(m_spec.nchannels);
const DeepData* dd = &deepdata;
std::unique_ptr<DeepData> dd_local; // In case we need a copy
bool same_chantypes = true;
for (int c = 0; c < nchans; ++c)
for (size_t c = 0; c < nchans; ++c)
same_chantypes &= (m_spec.channelformat(c) == deepdata.channeltype(c));
if (!same_chantypes) {
// If the channel types don't match, we need to make a copy of the
// DeepData and convert the channels to the spec's channel types.
std::vector<TypeDesc> chantypes;
if (m_spec.channelformats.size() == size_t(nchans))
if (m_spec.channelformats.size() == nchans)
chantypes = m_spec.channelformats;
else
chantypes.resize(nchans, m_spec.format);
Expand All @@ -1729,15 +1729,15 @@ OpenEXROutput::write_deep_scanlines(int ybegin, int yend, int /*z*/,
frameBuffer.insertSampleCountSlice(countslice);
std::vector<void*> pointerbuf;
dd->get_pointers(pointerbuf);
for (int c = 0; c < nchans; ++c) {
size_t slchans = size_t(m_spec.width) * nchans;
size_t xstride = sizeof(void*) * nchans;
size_t ystride = sizeof(void*) * slchans;
size_t samplestride = dd->samplesize();
for (size_t c = 0; c < nchans; ++c) {
Imf::DeepSlice slice(m_pixeltype[c],
(char*)(&pointerbuf[c] - m_spec.x * nchans
- ybegin * m_spec.width * nchans),
sizeof(void*)
* nchans, // xstride of pointer array
sizeof(void*) * nchans
* m_spec.width, // ystride of pointer array
dd->samplesize()); // stride of data sample
- ybegin * slchans),
xstride, ystride, samplestride);
frameBuffer.insert(m_spec.channelnames[c].c_str(), slice);
}
m_deep_scanline_output_part->setFrameBuffer(frameBuffer);
Expand Down Expand Up @@ -1772,17 +1772,17 @@ OpenEXROutput::write_deep_tiles(int xbegin, int xend, int ybegin, int yend,
return false;
}

int nchans = m_spec.nchannels;
size_t nchans = size_t(m_spec.nchannels);
const DeepData* dd = &deepdata;
std::unique_ptr<DeepData> dd_local; // In case we need a copy
bool same_chantypes = true;
for (int c = 0; c < nchans; ++c)
for (size_t c = 0; c < nchans; ++c)
same_chantypes &= (m_spec.channelformat(c) == deepdata.channeltype(c));
if (!same_chantypes) {
// If the channel types don't match, we need to make a copy of the
// DeepData and convert the channels to the spec's channel types.
std::vector<TypeDesc> chantypes;
if (m_spec.channelformats.size() == size_t(nchans))
if (m_spec.channelformats.size() == nchans)
chantypes = m_spec.channelformats;
else
chantypes.resize(nchans, m_spec.format);
Expand All @@ -1803,15 +1803,15 @@ OpenEXROutput::write_deep_tiles(int xbegin, int xend, int ybegin, int yend,
frameBuffer.insertSampleCountSlice(countslice);
std::vector<void*> pointerbuf;
dd->get_pointers(pointerbuf);
for (int c = 0; c < nchans; ++c) {
size_t slchans = width * nchans;
size_t xstride = sizeof(void*) * nchans;
size_t ystride = sizeof(void*) * slchans;
size_t samplestride = dd->samplesize();
for (size_t c = 0; c < nchans; ++c) {
Imf::DeepSlice slice(m_pixeltype[c],
(char*)(&pointerbuf[c] - xbegin * nchans
- ybegin * width * nchans),
sizeof(void*)
* nchans, // xstride of pointer array
sizeof(void*) * nchans
* width, // ystride of pointer array
dd->samplesize()); // stride of data sample
- ybegin * slchans),
xstride, ystride, samplestride);
frameBuffer.insert(m_spec.channelnames[c].c_str(), slice);
}
m_deep_tiled_output_part->setFrameBuffer(frameBuffer);
Expand Down
Loading