Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-12 21:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mkvmerge: avoid double-free and free-after-use in cleanup after write exceptions

Browse Source
This commit is contained in:
Moritz Bunkus 2017-01-07 18:26:22 +01:00
parent d21741253c
commit ab10a5d596
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/merge/cluster_helper.cpp
View File

@ -43,6 +43,13 @@ cluster_helper_c::cluster_helper_c()
}
cluster_helper_c::~cluster_helper_c() {
// If rendering fails e.g. due to the file system being full, the
// cleanup code can run into access-after-free and
// free-multiple-times situations due to blocks still being present
// in the cluster. Therefore just dump them as cluster_helper_c is a
// singleton class.
if (m && m->cluster)
m->cluster->RemoveAll();
}
mm_io_c *
@ -372,7 +379,7 @@ cluster_helper_c::must_duration_be_set(render_groups_c *rg,
int
cluster_helper_c::render() {
std::vector<render_groups_cptr> render_groups;
KaxCues cues;
kax_cues_with_cleanup_c cues;
cues.SetGlobalTimecodeScale(g_timecode_scale);
bool use_simpleblock = !hack_engaged(ENGAGE_NO_SIMPLE_BLOCKS);

12
src/merge/libmatroska_extensions.cpp
View File

@ -156,3 +156,15 @@ kax_cluster_c::delete_non_blocks() {
RemoveAll();
}
kax_cues_with_cleanup_c::kax_cues_with_cleanup_c()
: KaxCues{}
{
}
kax_cues_with_cleanup_c::~kax_cues_with_cleanup_c() {
// If rendering fails e.g. due to the file system being full,
// libmatroska may assert() due to myTempReferences being
// non-eempty. We don't care about that assertion.
myTempReferences.clear();
}

6
src/merge/libmatroska_extensions.h
View File

@ -92,4 +92,10 @@ public:
}
};
class kax_cues_with_cleanup_c: public KaxCues {
public:
kax_cues_with_cleanup_c();
virtual ~kax_cues_with_cleanup_c();
};
#endif // MTX_LIBMATROSKA_EXTENSIONS