From 627d423017cebb15a727afe65ae55dd26ce1a23a Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 24 Jun 2010 01:24:21 +0000 Subject: [PATCH] Fix memory leak in VariableData Originally committed to SVN as r4577. --- aegisub/src/ass_file.cpp | 2 +- aegisub/src/variable_data.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aegisub/src/ass_file.cpp b/aegisub/src/ass_file.cpp index 27eeb8435..c912405be 100644 --- a/aegisub/src/ass_file.cpp +++ b/aegisub/src/ass_file.cpp @@ -70,7 +70,7 @@ AssFile::AssFile () { /// @brief AssFile destructor AssFile::~AssFile() { - Clear(); + delete_clear(Line); } void AssFile::Load (const wxString &_filename,wxString charset,bool addToRecent) { diff --git a/aegisub/src/variable_data.cpp b/aegisub/src/variable_data.cpp index 05bc15f6e..1968e5c6d 100644 --- a/aegisub/src/variable_data.cpp +++ b/aegisub/src/variable_data.cpp @@ -43,13 +43,13 @@ #include "variable_data.h" /// @brief Constructor -VariableData::VariableData () { +VariableData::VariableData() { type = VARDATA_NONE; value = NULL; } /// @brief Destructor -VariableData::~VariableData () { +VariableData::~VariableData() { DeleteValue (); } @@ -64,7 +64,7 @@ void VariableData::DeleteValue () { case VARDATA_TEXT: delete value_text; break; case VARDATA_BOOL: delete value_bool; break; case VARDATA_COLOUR: delete value_colour; break; - case VARDATA_BLOCK: delete value_block; break; + case VARDATA_BLOCK: delete *value_block; delete value_block; break; default: break; } type = VARDATA_NONE;