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

Jump to bottom

Use readOrThrow() to detect premature EOF (backport #3005) #3006

Merged
merged 1 commit into from
Jul 4, 2024
Merged

Use readOrThrow() to detect premature EOF (backport #3005) #3006

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions src/asfvideo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ void AsfVideo::readMetadata() {

AsfVideo::HeaderReader::HeaderReader(const BasicIo::UniquePtr& io) : IdBuf_(GUID) {
if (io->size() >= io->tell() + GUID + QWORD) {
IdBuf_ = io->read(GUID);
io->readOrThrow(IdBuf_.data(), IdBuf_.size(), Exiv2::ErrorCode::kerCorruptedMetadata);

size_ = readQWORDTag(io);
if (size_ >= GUID + QWORD)
Expand Down Expand Up @@ -296,7 +296,7 @@ void AsfVideo::decodeBlock() {

void AsfVideo::decodeHeader() {
DataBuf nbHeadersBuf(DWORD + 1);
io_->read(nbHeadersBuf.data(), DWORD);
io_->readOrThrow(nbHeadersBuf.data(), DWORD, Exiv2::ErrorCode::kerCorruptedMetadata);

uint32_t nb_headers = Exiv2::getULong(nbHeadersBuf.data(), littleEndian);
Internal::enforce(nb_headers < std::numeric_limits<uint32_t>::max(), Exiv2::ErrorCode::kerCorruptedMetadata);
Expand Down Expand Up @@ -358,7 +358,8 @@ void AsfVideo::DegradableJPEGMedia() {
}

void AsfVideo::streamProperties() {
DataBuf streamTypedBuf = io_->read(GUID);
DataBuf streamTypedBuf(GUID);
io_->readOrThrow(streamTypedBuf.data(), streamTypedBuf.size(), Exiv2::ErrorCode::kerCorruptedMetadata);

enum class streamTypeInfo { Audio = 1, Video = 2 };
auto stream = static_cast<streamTypeInfo>(0);
Expand Down Expand Up @@ -476,7 +477,8 @@ void AsfVideo::contentDescription() {
} // AsfVideo::extendedContentDescription

void AsfVideo::fileProperties() {
DataBuf FileIddBuf = io_->read(GUID);
DataBuf FileIddBuf(GUID);
io_->readOrThrow(FileIddBuf.data(), FileIddBuf.size(), Exiv2::ErrorCode::kerCorruptedMetadata);
xmpData()["Xmp.video.FileID"] = GUIDTag(FileIddBuf.data()).to_string();
xmpData()["Xmp.video.FileLength"] = readQWORDTag(io_);
xmpData()["Xmp.video.CreationDate"] = readQWORDTag(io_);
Expand Down
Loading