lua: Fix memory leak on aegisub.cancel()
This commit is contained in:
parent
5050bad8ac
commit
79050dfdfb
2 changed files with 15 additions and 4 deletions
|
@ -78,6 +78,8 @@ namespace Automation4 {
|
||||||
std::deque<PendingCommit> pending_commits;
|
std::deque<PendingCommit> pending_commits;
|
||||||
/// Lines to delete once processing complete successfully
|
/// Lines to delete once processing complete successfully
|
||||||
std::vector<std::unique_ptr<AssEntry>> lines_to_delete;
|
std::vector<std::unique_ptr<AssEntry>> lines_to_delete;
|
||||||
|
/// Lines that were allocated here and need to be deleted if the script is cancelled.
|
||||||
|
std::vector<AssEntry *> allocated_lines;
|
||||||
|
|
||||||
/// Create copies of all of the lines in the script info section if it
|
/// Create copies of all of the lines in the script info section if it
|
||||||
/// hasn't already happened. This is done lazily, since it only needs
|
/// hasn't already happened. This is done lazily, since it only needs
|
||||||
|
@ -118,6 +120,8 @@ namespace Automation4 {
|
||||||
/// assumes a Lua representation of AssEntry on the top of the stack, and creates an AssEntry object of it
|
/// assumes a Lua representation of AssEntry on the top of the stack, and creates an AssEntry object of it
|
||||||
static std::unique_ptr<AssEntry> LuaToAssEntry(lua_State *L, AssFile *ass=nullptr);
|
static std::unique_ptr<AssEntry> LuaToAssEntry(lua_State *L, AssFile *ass=nullptr);
|
||||||
|
|
||||||
|
std::unique_ptr<AssEntry> LuaToTrackedAssEntry(lua_State *L);
|
||||||
|
|
||||||
/// @brief Signal that the script using this file is now done running
|
/// @brief Signal that the script using this file is now done running
|
||||||
/// @param set_undo If there's any uncommitted changes to the file,
|
/// @param set_undo If there's any uncommitted changes to the file,
|
||||||
/// they will be automatically committed with this
|
/// they will be automatically committed with this
|
||||||
|
|
|
@ -328,6 +328,12 @@ namespace Automation4 {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<AssEntry> LuaAssFile::LuaToTrackedAssEntry(lua_State *L) {
|
||||||
|
std::unique_ptr<AssEntry> e = LuaToAssEntry(L, ass);
|
||||||
|
allocated_lines.push_back(e.get());
|
||||||
|
return e;
|
||||||
|
}
|
||||||
|
|
||||||
int LuaAssFile::ObjectIndexRead(lua_State *L)
|
int LuaAssFile::ObjectIndexRead(lua_State *L)
|
||||||
{
|
{
|
||||||
switch (lua_type(L, 2)) {
|
switch (lua_type(L, 2)) {
|
||||||
|
@ -453,7 +459,7 @@ namespace Automation4 {
|
||||||
// insert
|
// insert
|
||||||
CheckBounds(n);
|
CheckBounds(n);
|
||||||
|
|
||||||
auto e = LuaToAssEntry(L, ass);
|
auto e = LuaToTrackedAssEntry(L);
|
||||||
modification_type |= modification_mask(e.get());
|
modification_type |= modification_mask(e.get());
|
||||||
QueueLineForDeletion(n - 1);
|
QueueLineForDeletion(n - 1);
|
||||||
AssignLine(n - 1, std::move(e));
|
AssignLine(n - 1, std::move(e));
|
||||||
|
@ -542,7 +548,7 @@ namespace Automation4 {
|
||||||
|
|
||||||
for (int i = 1; i <= n; i++) {
|
for (int i = 1; i <= n; i++) {
|
||||||
lua_pushvalue(L, i);
|
lua_pushvalue(L, i);
|
||||||
auto e = LuaToAssEntry(L, ass);
|
auto e = LuaToTrackedAssEntry(L);
|
||||||
modification_type |= modification_mask(e.get());
|
modification_type |= modification_mask(e.get());
|
||||||
|
|
||||||
if (lines.empty()) {
|
if (lines.empty()) {
|
||||||
|
@ -586,7 +592,7 @@ namespace Automation4 {
|
||||||
new_entries.reserve(n - 1);
|
new_entries.reserve(n - 1);
|
||||||
for (int i = 2; i <= n; i++) {
|
for (int i = 2; i <= n; i++) {
|
||||||
lua_pushvalue(L, i);
|
lua_pushvalue(L, i);
|
||||||
auto e = LuaToAssEntry(L, ass);
|
auto e = LuaToTrackedAssEntry(L);
|
||||||
modification_type |= modification_mask(e.get());
|
modification_type |= modification_mask(e.get());
|
||||||
InsertLine(new_entries, i - 2, std::move(e));
|
InsertLine(new_entries, i - 2, std::move(e));
|
||||||
lua_pop(L, 1);
|
lua_pop(L, 1);
|
||||||
|
@ -625,7 +631,7 @@ namespace Automation4 {
|
||||||
|
|
||||||
int LuaAssFile::LuaParseKaraokeData(lua_State *L)
|
int LuaAssFile::LuaParseKaraokeData(lua_State *L)
|
||||||
{
|
{
|
||||||
auto e = LuaToAssEntry(L, ass);
|
auto e = LuaToTrackedAssEntry(L);
|
||||||
auto dia = check_cast_constptr<AssDialogue>(e.get());
|
auto dia = check_cast_constptr<AssDialogue>(e.get());
|
||||||
argcheck(L, !!dia, 1, "Subtitle line must be a dialogue line");
|
argcheck(L, !!dia, 1, "Subtitle line must be a dialogue line");
|
||||||
|
|
||||||
|
@ -734,6 +740,7 @@ namespace Automation4 {
|
||||||
void LuaAssFile::Cancel()
|
void LuaAssFile::Cancel()
|
||||||
{
|
{
|
||||||
for (auto& line : lines_to_delete) line.release();
|
for (auto& line : lines_to_delete) line.release();
|
||||||
|
for (AssEntry *line : allocated_lines) delete line;
|
||||||
references--;
|
references--;
|
||||||
if (!references) delete this;
|
if (!references) delete this;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue