diff options
| author | Rusty Wagner <rusty@vector35.com> | 2019-08-06 17:31:22 -0400 |
|---|---|---|
| committer | Rusty Wagner <rusty@vector35.com> | 2019-08-06 17:48:29 -0400 |
| commit | d501ab95b2d90ebba4550b6cb7c7cfaa557750e1 (patch) | |
| tree | ade03618141c25eed69205002300d821430f75bc /architecture.cpp | |
| parent | 44cf4311014c0d16a6e809117dcb06400e023da1 (diff) | |
Fix some double frees with DisassemblyTextLine in API
Diffstat (limited to 'architecture.cpp')
| -rw-r--r-- | architecture.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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<DisassemblyTextLine> 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<Disa 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); } |