Fix memory leaks in Destiny testcase. Now sanitizers can be enabled i…

…n the workflow.
Ghabry · Jan 10, 2025 · c67693a · c67693a
1 parent 0630eb1
commit c67693a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/stable-compilation.yml b/.github/workflows/stable-compilation.yml
@@ -65,7 +65,7 @@ jobs:
           VER="(GA, `date +%Y-%m-%d`)"
           cmake -G Ninja -B build . \
             -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \
-            -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wdeprecated" \
+            -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wdeprecated -fsanitize=address,undefined" \
             -DPLAYER_BUILD_LIBLCF=ON -DPLAYER_VERSION_APPEND="$VER"
           cmake --build build
 

diff --git a/tests/game_destiny.cpp b/tests/game_destiny.cpp
@@ -6,26 +6,26 @@
 TEST_SUITE_BEGIN("Game_Destiny");
 
 
-static const lcf::rpg::EventCommand* MakeCommand(
+static lcf::rpg::EventCommand MakeCommand(
 	const lcf::rpg::EventCommand::Code code,
 	const std::string& string
 )
 {
-	lcf::rpg::EventCommand* cmd = new lcf::rpg::EventCommand;
+	lcf::rpg::EventCommand cmd;
 	lcf::DBString dbStr(string);
 
-	cmd->code = static_cast<uint32_t>(code);
-	cmd->string = dbStr;
+	cmd.code = static_cast<uint32_t>(code);
+	cmd.string = dbStr;
 
 	return cmd;
 }
 
-static lcf::rpg::SaveEventExecFrame* MakeFrame(
+static lcf::rpg::SaveEventExecFrame MakeFrame(
 	std::vector<std::string>::const_iterator begin,
 	std::vector<std::string>::const_iterator end
 )
 {
-	lcf::rpg::SaveEventExecFrame* frame = new lcf::rpg::SaveEventExecFrame;
+	lcf::rpg::SaveEventExecFrame frame;
 	lcf::rpg::EventCommand::Code code;
 
 	code = lcf::rpg::EventCommand::Code::Comment;
@@ -34,7 +34,7 @@ static lcf::rpg::SaveEventExecFrame* MakeFrame(
 	{
 		const std::string& str = *begin++;
 
-		frame->commands.push_back(*MakeCommand(code, str));
+		frame.commands.push_back(MakeCommand(code, str));
 		code = lcf::rpg::EventCommand::Code::Comment_2;
 	}
 
@@ -49,18 +49,14 @@ TEST_CASE("AssertDestinyScript")
 		"$",
 		"v[1] = 10;",
 	};
-	lcf::rpg::SaveEventExecFrame* frame;
 	const char* destinyScript;
 
-	frame = MakeFrame(lines.begin(), lines.end());
-	destinyScript = destiny.Interpreter().MakeString(*frame);
+	auto frame = MakeFrame(lines.begin(), lines.end());
+	destinyScript = destiny.Interpreter().MakeString(frame);
 
 	CHECK_EQ(*destinyScript, '$');
 
 	destiny.Interpreter().FreeString();
-	delete frame;
-	frame = nullptr;
 }
 
-
 TEST_SUITE_END();