Skip to content

EbmlMaster: fix leak on upper element found inside the last element #337

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
robUx4 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

EbmlMaster: fix leak on upper element found inside the last element #337

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
12 changes: 11 additions & 1 deletion src/EbmlMaster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,13 @@ void EbmlMaster::Read(EbmlStream & inDataStream, const EbmlSemanticContext & sCo

if (UpperEltFound) {
--UpperEltFound;
if (UpperEltFound > 0 || MaxSizeToRead <= 0)
if (UpperEltFound > 0)
goto processCrc;
if (MaxSizeToRead <= 0) {
delete FoundElt;
FoundElt = nullptr;
goto processCrc;
}
ElementLevelA = FoundElt;
}

Expand All @@ -372,6 +377,11 @@ void EbmlMaster::Read(EbmlStream & inDataStream, const EbmlSemanticContext & sCo
UpperEltFound--;
if (UpperEltFound > 0 || MaxSizeToRead <= 0)
goto processCrc;
if (MaxSizeToRead <= 0) {
delete FoundElt;
FoundElt = nullptr;
goto processCrc;
}
ElementLevelA = FoundElt;
continue;
}
Expand Down
Loading