From 3437f4fcaba244a290a6abe4f8dcccc8c35a9862 Mon Sep 17 00:00:00 2001
From: Edward Richardson <Edward850@crantime.org>
Date: Fri, 21 Nov 2014 17:49:57 +1300
Subject: [PATCH 1/2] Check ACS module size in saved games

---
 src/p_acs.cpp | 8 ++++++++
 src/p_acs.h   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index 03de8b3df..be4dea612 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -1581,20 +1581,28 @@ void FBehavior::StaticSerializeModuleStates (FArchive &arc)
 	for (modnum = 0; modnum < StaticModules.Size(); ++modnum)
 	{
 		FBehavior *module = StaticModules[modnum];
+		int ModSize = module->GetDataSize();
 
 		if (arc.IsStoring())
 		{
 			arc.WriteString (module->ModuleName);
+			if (SaveVersion >= 4516) arc << ModSize;
 		}
 		else
 		{
 			char *modname = NULL;
 			arc << modname;
+			if (SaveVersion >= 4516) arc << ModSize;
 			if (stricmp (modname, module->ModuleName) != 0)
 			{
 				delete[] modname;
 				I_Error ("Level was saved with a different set of ACS modules.");
 			}
+			else if (ModSize != module->GetDataSize())
+			{
+				delete[] modname;
+				I_Error("ACS module %s has changed from what was saved. (Have %d bytes, save has %d bytes)", module->ModuleName, module->GetDataSize(), ModSize);
+			}
 			delete[] modname;
 		}
 		module->SerializeVars (arc);
diff --git a/src/p_acs.h b/src/p_acs.h
index 02544e367..88016f0db 100644
--- a/src/p_acs.h
+++ b/src/p_acs.h
@@ -308,6 +308,7 @@ public:
 	int GetScriptIndex (const ScriptPtr *ptr) const { ptrdiff_t index = ptr - Scripts; return index >= NumScripts ? -1 : (int)index; }
 	ScriptPtr *GetScriptPtr(int index) const { return index >= 0 && index < NumScripts ? &Scripts[index] : NULL; }
 	int GetLumpNum() const { return LumpNum; }
+	int GetDataSize() const { return DataSize; }
 	const char *GetModuleName() const { return ModuleName; }
 	ACSProfileInfo *GetFunctionProfileData(int index) { return index >= 0 && index < NumFunctions ? &FunctionProfileData[index] : NULL; }
 	ACSProfileInfo *GetFunctionProfileData(ScriptFunction *func) { return GetFunctionProfileData((int)(func - (ScriptFunction *)Functions)); }

From c494063eb926cb73811b41457cea7fe5fcb917b9 Mon Sep 17 00:00:00 2001
From: Edward Richardson <Edward850@crantime.org>
Date: Fri, 21 Nov 2014 17:53:33 +1300
Subject: [PATCH 2/2] Forgot version bump

---
 src/version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/version.h b/src/version.h
index f091f416a..15d01d315 100644
--- a/src/version.h
+++ b/src/version.h
@@ -76,7 +76,7 @@ const char *GetVersionString();
 
 // Use 4500 as the base git save version, since it's higher than the
 // SVN revision ever got.
-#define SAVEVER 4515
+#define SAVEVER 4516
 
 #define SAVEVERSTRINGIFY2(x) #x
 #define SAVEVERSTRINGIFY(x) SAVEVERSTRINGIFY2(x)