C4MapCreatorS2: Disallow script execution in sections as they are loaded in a separate thread

Author: Fulgen301

src/C4Landscape.cpp

@@ -565,7 +565,7 @@ std::unique_ptr<CSurface8> C4Landscape::CreateMap(C4Random &random)
 	return surfaceMap;
 }
 
-std::unique_ptr<CSurface8> C4Landscape::CreateMapS2(C4Group &ScenFile, C4Random &random)
+std::unique_ptr<CSurface8> C4Landscape::CreateMapS2(C4Group &ScenFile, C4Random &random, const bool allowScript)
 {
 	// file present?
 	if (!ScenFile.AccessEntry(C4CFN_DynLandscape)) return nullptr;
@@ -575,7 +575,7 @@ std::unique_ptr<CSurface8> C4Landscape::CreateMapS2(C4Group &ScenFile, C4Random
 		pMapCreator = new C4MapCreatorS2(Section, random, &Section.C4S.Landscape, &Section.TextureMap, &Section.Material, Game.Parameters.StartupPlayerCount);
 
 	// read file
-	pMapCreator->ReadFile(C4CFN_DynLandscape, &ScenFile, random);
+	pMapCreator->ReadFile(C4CFN_DynLandscape, &ScenFile, random, allowScript);
 	// render landscape
 	// keep map creator until script callbacks have been done
 	return pMapCreator->Render(nullptr);
@@ -736,7 +736,7 @@ bool C4Landscape::InitEmpty(C4Random &random, const bool loadSky, bool &landscap
 	return FinalizeInit(landscapeLoaded, nullptr);
 }
 
-bool C4Landscape::Init(C4Group &hGroup, C4Group *const saveGameGroup, C4Random &random, bool fOverloadCurrent, bool fLoadSky, bool &rfLoaded, bool fSavegame)
+bool C4Landscape::Init(C4Group &hGroup, C4Group *const saveGameGroup, C4Random &random, const bool allowScript, bool fOverloadCurrent, bool fLoadSky, bool &rfLoaded, bool fSavegame)
 {
 	PrepareInit(random, fOverloadCurrent);
 
@@ -801,7 +801,7 @@ bool C4Landscape::Init(C4Group &hGroup, C4Group *const saveGameGroup, C4Random &
 
 		// dynamic map from file
 		if (!sfcMap)
-			if (sfcMap = CreateMapS2(hGroup, random))
+			if (sfcMap = CreateMapS2(hGroup, random, allowScript))
 				if (!fLandscapeModeSet) Mode = C4LSC_Dynamic;
 
 		// Dynamic map by scenario

src/C4Landscape.h

@@ -141,7 +141,7 @@ class C4Landscape
 	bool SaveMap(C4Group &hGroup);
 	bool SaveInitial();
 	bool SaveTextures(C4Group &hGroup);
-	bool Init(C4Group &hGroup, C4Group *const saveGameGroup, C4Random &random, bool fOverloadCurrent, bool fLoadSky, bool &rfLoaded, bool fSavegame);
+	bool Init(C4Group &hGroup, C4Group *const saveGameGroup, C4Random &random, bool allowScript, bool fOverloadCurrent, bool fLoadSky, bool &rfLoaded, bool fSavegame);
 	bool InitEmpty(C4Random &random, bool loadSky, bool &landscapeLoaded);
 	bool MapToLandscape();
 	bool ApplyDiff(C4Group &hGroup);
@@ -300,7 +300,7 @@ class C4Landscape
 	bool AssignMap(std::unique_ptr<CSurface8> map, C4Random &random, bool overloadCurrent, bool loadSky, bool savegame);
 	bool FinalizeInit(bool &landscapeLoaded, C4Group *groupForDiff);
 	std::unique_ptr<CSurface8> CreateMap(C4Random &random); // create map by landscape attributes
-	std::unique_ptr<CSurface8> CreateMapS2(C4Group &ScenFile, C4Random &random); // create map by def file
+	std::unique_ptr<CSurface8> CreateMapS2(C4Group &ScenFile, C4Random &random, bool allowScript); // create map by def file
 	CSurface8 *CreateEmptyMap(std::int32_t width, std::int32_t height);
 	bool Relight(C4Rect To);
 	bool ApplyLighting(C4Rect To);

src/C4MapCreatorS2.cpp

@@ -26,6 +26,8 @@
 
 #include <cassert>
 
+bool AlgoScript(C4MCOverlay *pOvrl, int32_t iX, int32_t iY);
+
 // C4MCCallbackArray
 
 C4MCCallbackArray::C4MCCallbackArray(C4AulFunc *pSFunc, C4MapCreatorS2 *pMapCreator)
@@ -352,6 +354,10 @@ bool C4MCOverlay::SetField(C4MCParser *pParser, const char *szField, const char
 				pAlgo = GetAlgo(StrPar);
 				// check validity
 				if (!pAlgo) throw C4MCParserErr(pParser, C4MCErr_AlgoNotFound, StrPar);
+				if (!pParser->AllowScript() && pAlgo->Function == &AlgoScript)
+				{
+					throw C4MCParserErr{pParser, C4MCErr_ScriptNotAllowed};
+				}
 				// store
 				this->*(pAttr->algorithm) = pAlgo;
 				break;
@@ -365,6 +371,10 @@ bool C4MCOverlay::SetField(C4MCParser *pParser, const char *szField, const char
 				break;
 			case C4MCV_ScriptFunc:
 			{
+				if (!pParser->AllowScript())
+				{
+					throw C4MCParserErr{pParser, C4MCErr_ScriptNotAllowed};
+				}
 				// get script func of main script
 				C4AulFunc *pSFunc = Game.Script.GetSFunc(StrPar, AA_PROTECTED);
 				if (!pSFunc) throw C4MCParserErr(pParser, C4MCErr_SFuncNotFound, StrPar);
@@ -718,12 +728,12 @@ void C4MapCreatorS2::Clear()
 	CallbackArrays.Clear();
 }
 
-bool C4MapCreatorS2::ReadFile(const char *szFilename, C4Group *pGrp, C4Random &random)
+bool C4MapCreatorS2::ReadFile(const char *szFilename, C4Group *pGrp, C4Random &random, const bool allowScript)
 {
 	// create parser and read file
 	try
 	{
-		C4MCParser(this, random).ParseFile(szFilename, pGrp);
+		C4MCParser(this, random, allowScript).ParseFile(szFilename, pGrp);
 	}
 	catch (const C4MCParserErr &err)
 	{
@@ -739,7 +749,7 @@ bool C4MapCreatorS2::ReadScript(const char *szScript, C4Random &random)
 	// create parser and read
 	try
 	{
-		C4MCParser(this, random).Parse(szScript);
+		C4MCParser(this, random, true).Parse(szScript);
 	}
 	catch (const C4MCParserErr &err)
 	{
@@ -808,8 +818,8 @@ void C4MCParserErr::show() const
 
 // parser
 
-C4MCParser::C4MCParser(C4MapCreatorS2 *pMapCreator, C4Random &random)
-	: MapCreator{pMapCreator}, random{random}
+C4MCParser::C4MCParser(C4MapCreatorS2 *pMapCreator, C4Random &random, const bool allowScript)
+	: MapCreator{pMapCreator}, random{random}, allowScript{allowScript}
 {
 	// reset some fields
 	Code = nullptr; CPos = nullptr; *Filename = 0;

src/C4MapCreatorS2.h

@@ -63,6 +63,7 @@
 #define C4MCErr_MatNotFound       "material '{}' not found"
 #define C4MCErr_TexNotFound       "texture '{}' not found"
 #define C4MCErr_AlgoNotFound      "algorithm '{}' not found"
+#define C4MCErr_ScriptNotAllowed  "script execution is not allowed"
 #define C4MCErr_SFuncNotFound     "script func '{}' not found in scenario script"
 #define C4MCErr_PointOnlyOvl      "point only allowed in overlays"
 
@@ -356,7 +357,7 @@ class C4MapCreatorS2 : public C4MCNode
 
 	void Default(C4Random &random); // set default data
 	void Clear(); // clear any data
-	bool ReadFile(const char *szFilename, C4Group *pGrp, C4Random &random); // read defs of file
+	bool ReadFile(const char *szFilename, C4Group *pGrp, C4Random &random, bool allowScript); // read defs of file
 	bool ReadScript(const char *szScript, C4Random &random); // reads def directly from mem
 
 public:
@@ -414,6 +415,7 @@ class C4MCParser
 private:
 	C4MapCreatorS2 *MapCreator; // map creator parsing into
 	C4Random &random; // random generator to use
+	bool allowScript; // whether the script algorithm is allowed
 	char *Code; // loaded code
 	const char *CPos; // current parser pos in code
 	C4MCTokenType CurrToken; // last token read
@@ -427,13 +429,15 @@ class C4MCParser
 	void ParseValue(C4MCNode *pToNode, const char *szFieldName); // Set Field
 
 public:
-	C4MCParser(C4MapCreatorS2 *pMapCreator, C4Random &random);
+	C4MCParser(C4MapCreatorS2 *pMapCreator, C4Random &random, bool allowScript);
 	~C4MCParser();
 
 	void Clear(); // clear stuff
 
 	void ParseFile(const char *szFilename, C4Group *pGrp); // load and parse file
 	void Parse(const char *szScript); // load and parse from mem
 
+	bool AllowScript() const noexcept { return allowScript; }
+
 	friend class C4MCParserErr;
 };

src/C4Section.cpp

@@ -394,7 +394,7 @@ bool C4Section::InitMaterialTexture(C4Section *const fallback)
 bool C4Section::InitSecondPart(C4Random &random)
 {
 	LandscapeLoaded = false;
-	if (!(emptyLandscape ? Landscape.InitEmpty(random, true, LandscapeLoaded) : Landscape.Init(Group, SaveGameGroup ? &*SaveGameGroup : nullptr, random, false, true, LandscapeLoaded, C4S.Head.SaveGame)))
+	if (!(emptyLandscape ? Landscape.InitEmpty(random, true, LandscapeLoaded) : Landscape.Init(Group, SaveGameGroup ? &*SaveGameGroup : nullptr, random, name.empty(), false, true, LandscapeLoaded, C4S.Head.SaveGame)))
 	{
 		LogFatal(C4ResStrTableKey::IDS_ERR_GBACK);
 		return false;