Skip to content

KaxBlock: fix leak when reading EBML lace is aborted #226

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

KaxBlock: fix leak when reading EBML lace is aborted #226

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
9 changes: 5 additions & 4 deletions src/KaxBlock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,6 @@ filepos_t KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully)
if (Result != 5)
throw SafeReadIOCallback::EndOfStreamX(0);
binary *cursor = _TempHead;
binary *_tmpBuf;
std::uint8_t BlockHeadSize = 4;

// update internal values
Expand Down Expand Up @@ -699,8 +698,10 @@ filepos_t KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully)
SizeList[Index] = LastBufferSize;
break;
case LACING_EBML:
{
SizeRead = LastBufferSize;
cursor = _tmpBuf = new binary[FrameNum*4]; /// \warning assume the mean size will be coded in less than 4 bytes
auto _tmpBuf = std::make_unique<binary[]>(FrameNum*4); /// \warning assume the mean size will be coded in less than 4 bytes
cursor = _tmpBuf.get();
Result += input.read(cursor, FrameNum*4);
FrameSize = ReadCodedSizeValue(cursor, SizeRead, SizeUnknown);
if (FrameSize > TotalLacedSize)
Expand All @@ -720,11 +721,11 @@ filepos_t KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully)
LastBufferSize -= FrameSize + SizeRead;
}

FirstFrameLocation += cursor - _tmpBuf;
FirstFrameLocation += cursor - _tmpBuf.get();

SizeList[Index] = LastBufferSize;
delete [] _tmpBuf;
break;
}
case LACING_FIXED:
for (Index=0; Index<=FrameNum; Index++) {
// get the size of the frame
Expand Down