third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Current master fails with image #2565: segmentation fault when trying to access outofband offest

Browse Source
This commit is contained in:
Mohamed Ali Chebbi 2023-04-13 00:53:18 +02:00 committed by Rosen Penev
parent c4e514cff8
commit e403f3a4c4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jpgimage.cpp
View File

@ -152,9 +152,9 @@ void JpegBase::readMetadata() {
const auto [sizebuf, size] = readSegmentSize(marker, *io_); const auto [sizebuf, size] = readSegmentSize(marker, *io_);
// Read the rest of the segment. // Read the rest of the segment.
DataBuf buf(size + 1); DataBuf buf(size);
/// \todo check if it makes sense to check for size /// \todo check if it makes sense to check for size
if (size > 0) { if (size > 2) {
io_->readOrThrow(buf.data(2), size - 2, ErrorCode::kerFailedToReadImageData); io_->readOrThrow(buf.data(2), size - 2, ErrorCode::kerFailedToReadImageData);
std::copy(sizebuf.begin(), sizebuf.end(), buf.begin()); std::copy(sizebuf.begin(), sizebuf.end(), buf.begin());
} }
@ -353,7 +353,7 @@ void JpegBase::printStructure(std::ostream& out, PrintStructureOption option, si
const auto [sizebuf, size] = readSegmentSize(marker, *io_); const auto [sizebuf, size] = readSegmentSize(marker, *io_);
// Read the rest of the segment. // Read the rest of the segment.
DataBuf buf(size + 1); DataBuf buf(size);
if (size > 0) { if (size > 0) {
io_->readOrThrow(buf.data(2), size - 2, ErrorCode::kerFailedToReadImageData); io_->readOrThrow(buf.data(2), size - 2, ErrorCode::kerFailedToReadImageData);
std::copy(sizebuf.begin(), sizebuf.end(), buf.begin()); std::copy(sizebuf.begin(), sizebuf.end(), buf.begin());
@ -565,7 +565,7 @@ DataBuf JpegBase::readNextSegment(byte marker) {
const auto [sizebuf, size] = readSegmentSize(marker, *io_); const auto [sizebuf, size] = readSegmentSize(marker, *io_);
// Read the rest of the segment. // Read the rest of the segment.
DataBuf buf(size + 1); DataBuf buf(size);
if (size > 0) { if (size > 0) {
io_->readOrThrow(buf.data(2), size - 2, ErrorCode::kerFailedToReadImageData); io_->readOrThrow(buf.data(2), size - 2, ErrorCode::kerFailedToReadImageData);
std::copy(sizebuf.begin(), sizebuf.end(), buf.begin()); std::copy(sizebuf.begin(), sizebuf.end(), buf.begin());