Fix uses of sscanf not checking return values

#91
twhl-community · Nov 28, 2021 · 3e9a8f0 · 3e9a8f0
1 parent bed2ed9
commit 3e9a8f0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/cl_dll/vgui_SchemeManager.cpp b/cl_dll/vgui_SchemeManager.cpp
@@ -145,11 +145,21 @@ static byte* LoadFileByResolution(const char* filePrefix, int xRes, const char*
 static void ParseRGBAFromString(byte colorArray[4], const char* colorVector)
 {
 	int r, g, b, a;
-	sscanf(colorVector, "%d %d %d %d", &r, &g, &b, &a);
-	colorArray[0] = r;
-	colorArray[1] = g;
-	colorArray[2] = b;
-	colorArray[3] = a;
+	if (4 == sscanf(colorVector, "%d %d %d %d", &r, &g, &b, &a))
+	{
+		colorArray[0] = r;
+		colorArray[1] = g;
+		colorArray[2] = b;
+		colorArray[3] = a;
+	}
+	else
+	{
+		//Pure white for easier debugging
+		colorArray[0] = 255;
+		colorArray[1] = 255;
+		colorArray[2] = 255;
+		colorArray[3] = 255;
+	}
 }
 
 //-----------------------------------------------------------------------------

diff --git a/dlls/lights.cpp b/dlls/lights.cpp
@@ -147,9 +147,9 @@ bool CEnvLight::KeyValue(KeyValueData* pkvd)
 {
 	if (FStrEq(pkvd->szKeyName, "_light"))
 	{
-		int r, g, b, v, j;
+		int r = 0, g = 0, b = 0, v = 0;
 		char szColor[64];
-		j = sscanf(pkvd->szValue, "%d %d %d %d\n", &r, &g, &b, &v);
+		const int j = sscanf(pkvd->szValue, "%d %d %d %d\n", &r, &g, &b, &v);
 		if (j == 1)
 		{
 			g = b = r;

diff --git a/game_shared/voice_gamemgr.cpp b/game_shared/voice_gamemgr.cpp
@@ -178,9 +178,8 @@ bool CVoiceGameMgr::ClientCommand(CBasePlayer* pPlayer, const char* cmd)
 		for (int i = 1; i < CMD_ARGC(); i++)
 		{
 			uint32 mask = 0;
-			sscanf(CMD_ARGV(i), "%x", &mask);
 
-			if (i <= VOICE_MAX_PLAYERS_DW)
+			if (1 == sscanf(CMD_ARGV(i), "%x", &mask) && i <= VOICE_MAX_PLAYERS_DW)
 			{
 				VoiceServerDebug("CVoiceGameMgr::ClientCommand: vban (0x%x) from %d\n", mask, playerClientIndex);
 				g_BanMasks[playerClientIndex].SetDWord(i - 1, mask);