From 2829c7ffde1ac1a6270a4dfab2b70fbc289e3c55 Mon Sep 17 00:00:00 2001
From: Artem Golubikhin <WPMGPRoSToTeMa@users.noreply.github.com>
Date: Mon, 9 Oct 2017 18:06:05 +0300
Subject: [PATCH] Fixed saving temporary string in PF_lightstyle_I (#532)

Fixed saving temporary string in PF_lightstyle_I
Marked mismatched code (HLTV)
Fixed lightstyle copying in ParseSaveTables (SinglePlayer)
---
 rehlds/HLTV/Core/src/World.cpp |  7 +++++++
 rehlds/HLTV/Core/src/World.h   |  1 +
 rehlds/common/qlimits.h        |  1 +
 rehlds/engine/host_cmd.cpp     | 12 ++++++++----
 rehlds/engine/host_cmd.h       |  2 +-
 rehlds/engine/pr_cmds.cpp      |  5 +++++
 rehlds/engine/server.h         |  2 ++
 7 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/rehlds/HLTV/Core/src/World.cpp b/rehlds/HLTV/Core/src/World.cpp
index 8fb764f..3d232d7 100644
--- a/rehlds/HLTV/Core/src/World.cpp
+++ b/rehlds/HLTV/Core/src/World.cpp
@@ -353,6 +353,13 @@ void World::AddLightStyle(int index, char *style)
 		m_System->Printf("WARNING! World::SetLightStyle: style too long (%i).\n", length);
 	}
 
+	// FIXME: code mismatch
+	// Original code:
+	// Q_strncopy(..., 64);
+	// ...[63] = '\0';
+	// Current code:
+	// Q_strncopy(..., 64);
+	// ...[64] = '\0';
 	Q_strlcpy(m_Lightstyles[index], style);
 }
 
diff --git a/rehlds/HLTV/Core/src/World.h b/rehlds/HLTV/Core/src/World.h
index b0c6aa9..3f0030f 100644
--- a/rehlds/HLTV/Core/src/World.h
+++ b/rehlds/HLTV/Core/src/World.h
@@ -251,6 +251,7 @@ protected:
 	entity_state_t m_Instanced_BaseLines[MAX_INSTANCED_BASELINES];
 
 	int m_MaxInstanced_BaseLine;
+	// TODO: wtf, why 65? here should be 64
 	char m_Lightstyles[MAX_LIGHTSTYLES][65];
 
 	movevars_t m_MoveVars;
diff --git a/rehlds/common/qlimits.h b/rehlds/common/qlimits.h
index c19e670..1a67bd5 100644
--- a/rehlds/common/qlimits.h
+++ b/rehlds/common/qlimits.h
@@ -24,6 +24,7 @@
 
 #define MAX_LIGHTSTYLE_INDEX_BITS	6
 #define MAX_LIGHTSTYLES			(1<<MAX_LIGHTSTYLE_INDEX_BITS)
+constexpr auto MAX_LIGHTSTYLE_SIZE = size_t{64};
 
 // Resource counts
 #define MAX_MODEL_INDEX_BITS		9	// sent as a short
diff --git a/rehlds/engine/host_cmd.cpp b/rehlds/engine/host_cmd.cpp
index aa6b1df..c3580a1 100644
--- a/rehlds/engine/host_cmd.cpp
+++ b/rehlds/engine/host_cmd.cpp
@@ -1636,8 +1636,7 @@ SAVERESTOREDATA *SaveGamestate(void)
 		if (g_psv.lightstyles[i])
 		{
 			light.index = i;
-			Q_strncpy(light.style, g_psv.lightstyles[i], 63);
-			light.style[63] = 0;
+			Q_strlcpy(light.style, g_psv.lightstyles[i]);
 			gEntityInterface.pfnSaveWriteFields(pSaveData, "LIGHTSTYLE", &light, gLightstyleDescription, ARRAYSIZE(gLightstyleDescription));
 		}
 	}
@@ -1844,10 +1843,15 @@ void ParseSaveTables(SAVERESTOREDATA *pSaveData, SAVE_HEADER *pHeader, int updat
 		gEntityInterface.pfnSaveReadFields(pSaveData, "LIGHTSTYLE", &light, gLightstyleDescription, ARRAYSIZE(gLightstyleDescription));
 		if (updateGlobals)
 		{
+#ifdef REHLDS_FIXES
+			Q_strlcpy(g_rehlds_sv.lightstyleBuffers[light.index], light.style);
+			g_psv.lightstyles[light.index] = g_rehlds_sv.lightstyleBuffers[light.index];
+#else // REHLDS_FIXES
 			char *val = (char *)Hunk_Alloc(Q_strlen(light.style) + 1);
-			Q_strncpy(val, light.style, 3);
-			val[3] = 0;
+			Q_strncpy(val, light.style, ARRAYSIZE(val) - 1);
+			val[ARRAYSIZE(val) - 1] = '\0';
 			g_psv.lightstyles[light.index] = val;
+#endif // REHLDS_FIXES
 		}
 	}
 }
diff --git a/rehlds/engine/host_cmd.h b/rehlds/engine/host_cmd.h
index 22324c4..ec9b3b2 100644
--- a/rehlds/engine/host_cmd.h
+++ b/rehlds/engine/host_cmd.h
@@ -69,7 +69,7 @@ typedef struct SAVE_HEADER_s
 typedef struct SAVELIGHTSTYLE_s
 {
 	int index;
-	char style[64];
+	char style[MAX_LIGHTSTYLE_SIZE];
 } SAVELIGHTSTYLE;
 
 typedef struct TITLECOMMENT_s
diff --git a/rehlds/engine/pr_cmds.cpp b/rehlds/engine/pr_cmds.cpp
index b32a7df..e9d13ab 100644
--- a/rehlds/engine/pr_cmds.cpp
+++ b/rehlds/engine/pr_cmds.cpp
@@ -1711,7 +1711,12 @@ int EXT_FUNC PF_DecalIndex(const char *name)
 
 void EXT_FUNC PF_lightstyle_I(int style, const char *val)
 {
+#ifdef REHLDS_FIXES
+	Q_strlcpy(g_rehlds_sv.lightstyleBuffers[style], val);
+	g_psv.lightstyles[style] = g_rehlds_sv.lightstyleBuffers[style];
+#else // REHLDS_FIXES
 	g_psv.lightstyles[style] = val;
+#endif // REHLDS_FIXES
 	if (g_psv.state != ss_active)
 		return;
 
diff --git a/rehlds/engine/server.h b/rehlds/engine/server.h
index ed24fa0..a92163e 100644
--- a/rehlds/engine/server.h
+++ b/rehlds/engine/server.h
@@ -170,6 +170,8 @@ struct rehlds_server_t {
 	resource_t resources[RESOURCE_MAX_COUNT];
 	char precachedGenericResourceNames[RESOURCE_MAX_COUNT][MAX_QPATH];
 	size_t precachedGenericResourceCount;
+
+	char lightstyleBuffers[MAX_LIGHTSTYLES][MAX_LIGHTSTYLE_SIZE];
 #endif
 };