Fix a crash or random memory leak when reseting saved environment variable in test_servermodmanager.cpp

nerzhul · nerzhul · commit e800684ead56 · 2018-03-16T19:34:41.000+01:00
diff --git a/src/unittest/test_servermodmanager.cpp b/src/unittest/test_servermodmanager.cpp
@@ -71,11 +71,15 @@ void TestServerModManager::runTests(IGameDef *gamedef)
 #ifdef WIN32
 	{
 		std::string subgame_path("MINETEST_SUBGAME_PATH=");
-		subgame_path.append(saved_env_mt_subgame_path);
+		if (saved_env_mt_subgame_path)
+			subgame_path.append(saved_env_mt_subgame_path);
 		_putenv(subgame_path.c_str());
 	}
 #else
-	setenv("MINETEST_SUBGAME_PATH", saved_env_mt_subgame_path, 1);
+	if (saved_env_mt_subgame_path)
+		setenv("MINETEST_SUBGAME_PATH", saved_env_mt_subgame_path, 1);
+	else
+		unsetenv("MINETEST_SUBGAME_PATH");
 #endif
 }
 

Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,15 @@ void TestServerModManager::runTests(IGameDef *gamedef)`
`71`	`71`	`#ifdef WIN32`
`72`	`72`	`{`
`73`	`73`	`std::string subgame_path("MINETEST_SUBGAME_PATH=");`
`74`		`- subgame_path.append(saved_env_mt_subgame_path);`
	`74`	`+ if (saved_env_mt_subgame_path)`
	`75`	`+ subgame_path.append(saved_env_mt_subgame_path);`
`75`	`76`	`_putenv(subgame_path.c_str());`
`76`	`77`	`}`
`77`	`78`	`#else`
`78`		`- setenv("MINETEST_SUBGAME_PATH", saved_env_mt_subgame_path, 1);`
	`79`	`+ if (saved_env_mt_subgame_path)`
	`80`	`+ setenv("MINETEST_SUBGAME_PATH", saved_env_mt_subgame_path, 1);`
	`81`	`+ else`
	`82`	`+ unsetenv("MINETEST_SUBGAME_PATH");`
`79`	`83`	`#endif`
`80`	`84`	`}`
`81`	`85`