Fix some double frees with DisassemblyTextLine in API

2 files changed, 10 insertions, 10 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);
 	}
 
diff --git a/basicblock.cpp b/basicblock.cpp
index 03a2386f..6489c538 100644
--- a/basicblock.cpp
+++ b/basicblock.cpp
@@ -295,8 +295,8 @@ vector<DisassemblyTextLine> BasicBlock::GetDisassemblyText(DisassemblySettings*
 		line.addr = lines[i].addr;
 		line.instrIndex = lines[i].instrIndex;
 		line.highlight = lines[i].highlight;
-		line.tokens = InstructionTextToken::ConvertAndFreeInstructionTextTokenList(lines[i].tokens, lines[i].count);
-		line.tags = Tag::ConvertAndFreeTagList(lines[i].tags, lines[i].tagCount);
+		line.tokens = InstructionTextToken::ConvertInstructionTextTokenList(lines[i].tokens, lines[i].count);
+		line.tags = Tag::ConvertTagList(lines[i].tags, lines[i].tagCount);
 		result.push_back(line);
 	}