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

Fix long-running loop

Browse Source
This commit is contained in:
Kevin Backhouse
2023-03-04 16:37:49 +00:00
parent 725875497b
commit b5bf079444
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/asfvideo.cpp
+10 -3
View File
@@ -279,12 +279,19 @@ void AsfVideo::decodeBlock() {
DegradableJPEGMedia();
else // tag found but not processed
{
io_->seekOrThrow(io_->tell() + objectHeader.getRemainingSize(), BasicIo::beg,
ErrorCode::kerFailedToReadImageData);
// Make sure that the remaining size is non-zero, so that we won't
// keep revisiting the same location in the file.
const uint64_t remaining_size = objectHeader.getRemainingSize();
Internal::enforce(remaining_size > 0, Exiv2::ErrorCode::kerCorruptedMetadata);
io_->seekOrThrow(io_->tell() + remaining_size, BasicIo::beg, ErrorCode::kerFailedToReadImageData);
}
} else // tag not found
{
io_->seekOrThrow(io_->tell() + objectHeader.getRemainingSize(), BasicIo::beg, ErrorCode::kerFailedToReadImageData);
// Make sure that the remaining size is non-zero, so that we won't keep
// revisiting the same location in the file.
const uint64_t remaining_size = objectHeader.getRemainingSize();
Internal::enforce(remaining_size > 0, Exiv2::ErrorCode::kerCorruptedMetadata);
io_->seekOrThrow(io_->tell() + remaining_size, BasicIo::beg, ErrorCode::kerFailedToReadImageData);
}
} // AsfVideo::decodeBlock