generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "mkvmuxer: Fix leak when a Cluster isn't finalized"

Browse Source
This commit is contained in:
Vignesh Venkatasubramanian
2016-04-29 02:17:33 +00:00
committed by Gerrit Code Review
parent eacb314525 cbd676bb66
commit 26d673e737
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mkvmuxer/mkvmuxer.cc
View File

@@ -2229,7 +2229,17 @@ Cluster::Cluster(uint64_t timecode, int64_t cues_pos, uint64_t timecode_scale,
write_last_frame_with_duration_(write_last_frame_with_duration),
writer_(NULL) {}
Cluster::~Cluster() {}
Cluster::~Cluster() {
// Delete any stored frames that are left behind. This will happen if the
// Cluster was not Finalized for whatever reason.
while (!stored_frames_.empty()) {
while (!stored_frames_.begin()->second.empty()) {
delete stored_frames_.begin()->second.front();
stored_frames_.begin()->second.pop_front();
}
stored_frames_.erase(stored_frames_.begin()->first);
}
}
bool Cluster::Init(IMkvWriter* ptr_writer) {
if (!ptr_writer) {