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

Fix for a minor potential memleak. Also the list of unique IDs used in chapters must be cleared when chapters are loaded.

Browse Source
This commit is contained in:
Moritz Bunkus 2006-11-12 10:30:53 +00:00
parent dd190b98b0
commit 04674adcd5
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mmg/tab_chapters.cpp
View File

@ -475,10 +475,10 @@ tab_chapters::enable_buttons(bool enable) {
void
tab_chapters::on_new_chapters(wxCommandEvent &evt) {
file_name = wxT("");
if (chapters != NULL)
delete chapters;
tc_chapters->DeleteAllItems();
tid_root = tc_chapters->AddRoot(wxT("(new chapter file)"));
if (chapters != NULL)
delete chapters;
chapters = new KaxChapters;
m_chapters->Enable(ID_M_CHAPTERS_SAVE, true);
@ -628,6 +628,9 @@ tab_chapters::load(wxString name) {
wxString s;
int pos;
clear_list_of_unique_uint32(UNIQUE_CHAPTER_IDS);
clear_list_of_unique_uint32(UNIQUE_EDITION_IDS);
try {
if (kax_analyzer_c::probe(wxMB(name))) {
if (analyzer != NULL)
@ -662,6 +665,8 @@ tab_chapters::load(wxString name) {
source_is_kax_file = false;
}
} catch (error_c ex) {
if (analyzer)
delete analyzer;
analyzer = NULL;
s = wxU(ex.get_error().c_str());
break_line(s);
@ -790,9 +795,6 @@ tab_chapters::save() {
try {
out = new mm_file_io_c(wxMB(file_name), MODE_CREATE);
#if defined(SYS_WINDOWS)
out->use_dos_style_newlines(true);
#endif
} catch (...) {
err.Printf(wxT("Could not open the destination file '%s' for writing."
" Error code: %d (%s)."), file_name.c_str(), errno,
@ -802,6 +804,9 @@ tab_chapters::save() {
return;
}
#if defined(SYS_WINDOWS)
out->use_dos_style_newlines(true);
#endif
out->write_bom("UTF-8");
out->printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"\n"