Merge pull request ddnet#9125 from KebsCS/pr-command-argument-validation

Fix color validation in some commands
sjrc6 · Oct 7, 2024 · 46abb54 · 46abb54
2 parents 10df82a + 6d7aeab
commit 46abb54
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/engine/shared/console.cpp b/src/engine/shared/console.cpp
@@ -511,7 +511,15 @@ void CConsole::ExecuteLineStroked(int Stroke, const char *pStr, int ClientId, bo
 
 				if(Stroke || IsStrokeCommand)
 				{
-					if(int Error = ParseArgs(&Result, pCommand->m_pParams, pCommand->m_pfnCallback == &SColorConfigVariable::CommandCallback))
+					bool IsColor = false;
+					{
+						FCommandCallback pfnCallback = pCommand->m_pfnCallback;
+						void *pUserData = pCommand->m_pUserData;
+						TraverseChain(&pfnCallback, &pUserData);
+						IsColor = pfnCallback == &SColorConfigVariable::CommandCallback;
+					}
+
+					if(int Error = ParseArgs(&Result, pCommand->m_pParams, IsColor))
 					{
 						char aBuf[CMDLINE_LENGTH + 64];
 						if(Error == PARSEARGS_INVALID_INTEGER)