Skip to content

EbmlBinary: only set the Set flag when the whole data are read #308

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

EbmlBinary: only set the Set flag when the whole data are read #308

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2694bc0
EbmlBinary: only set the Set flag when the whole data are read
robUx4 Feb 28, 2025
c9a978f
EbmlBinary: cache the size we want to read
robUx4 Feb 28, 2025
9869643
EbmlBinary: use readFully() to make sure we read the whole data
robUx4 Feb 28, 2025
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/EbmlBinary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,25 +72,27 @@ filepos_t EbmlBinary::UpdateSize(const ShouldWrite & writeFilter, bool /* bForce

filepos_t EbmlBinary::ReadData(IOCallback & input, ScopeMode ReadFully)
{
const auto SizeToRead = GetSize();
if (Data != nullptr) {
free(Data);
Data = nullptr;
}

if (ReadFully == SCOPE_NO_DATA) {
return GetSize();
return SizeToRead;
}

if (!GetSize()) {
if (!SizeToRead) {
SetValueIsSet();
return 0;
}

Data = (GetSize() < std::numeric_limits<std::size_t>::max()) ? static_cast<binary *>(malloc(GetSize())) : nullptr;
Data = (SizeToRead < std::numeric_limits<std::size_t>::max()) ? static_cast<binary *>(malloc(SizeToRead)) : nullptr;
if (Data == nullptr)
throw std::runtime_error("Error allocating data");
input.readFully(Data, SizeToRead);
SetValueIsSet();
return input.read(Data, GetSize());
return SizeToRead;
}

bool EbmlBinary::operator==(const EbmlBinary & ElementToCompare) const
Expand Down
Loading