From d501ab95b2d90ebba4550b6cb7c7cfaa557750e1 Mon Sep 17 00:00:00 2001 From: Rusty Wagner Date: Tue, 6 Aug 2019 17:31:22 -0400 Subject: Fix some double frees with DisassemblyTextLine in API --- architecture.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'architecture.cpp') diff --git a/architecture.cpp b/architecture.cpp index b2022af6..a7ee3688 100644 --- a/architecture.cpp +++ b/architecture.cpp @@ -2282,8 +2282,8 @@ bool DisassemblyTextRenderer::GetInstructionText(uint64_t addr, size_t& len, line.addr = result[i].addr; line.instrIndex = result[i].instrIndex; line.highlight = result[i].highlight; - line.tokens = InstructionTextToken::ConvertAndFreeInstructionTextTokenList(result[i].tokens, result[i].count); - line.tags = Tag::ConvertAndFreeTagList(result[i].tags, result[i].tagCount); + line.tokens = InstructionTextToken::ConvertInstructionTextTokenList(result[i].tokens, result[i].count); + line.tags = Tag::ConvertTagList(result[i].tags, result[i].tagCount); lines.push_back(line); } @@ -2318,8 +2318,8 @@ vector DisassemblyTextRenderer::PostProcessInstructionTextL line.addr = result[i].addr; line.instrIndex = result[i].instrIndex; line.highlight = result[i].highlight; - line.tokens = InstructionTextToken::ConvertAndFreeInstructionTextTokenList(result[i].tokens, result[i].count); - line.tags = Tag::ConvertAndFreeTagList(result[i].tags, result[i].tagCount); + line.tokens = InstructionTextToken::ConvertInstructionTextTokenList(result[i].tokens, result[i].count); + line.tags = Tag::ConvertTagList(result[i].tags, result[i].tagCount); outLines.push_back(line); } @@ -2341,8 +2341,8 @@ bool DisassemblyTextRenderer::GetDisassemblyText(uint64_t addr, size_t& len, vec line.addr = result[i].addr; line.instrIndex = result[i].instrIndex; line.highlight = result[i].highlight; - line.tokens = InstructionTextToken::ConvertAndFreeInstructionTextTokenList(result[i].tokens, result[i].count); - line.tags = Tag::ConvertAndFreeTagList(result[i].tags, result[i].tagCount); + line.tokens = InstructionTextToken::ConvertInstructionTextTokenList(result[i].tokens, result[i].count); + line.tags = Tag::ConvertTagList(result[i].tags, result[i].tagCount); lines.push_back(line); } @@ -2438,8 +2438,8 @@ void DisassemblyTextRenderer::WrapComment(DisassemblyTextLine& line, vector