fix(input/five): infinite loop in command check

citizenfx · Dec 7, 2020 · 95cdaf0 · 95cdaf0
1 parent f8dcc1d
commit 95cdaf0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/code/client/citicore/console/Console.cpp b/code/client/citicore/console/Console.cpp
@@ -382,7 +382,7 @@ static inline bool IsEscapeChar(typename ProgramArguments::TCharType c)
 	return (c == U'"');
 }
 
-ProgramArguments Tokenize(const std::string& lineUtf8)
+DLL_EXPORT ProgramArguments Tokenize(const std::string& lineUtf8)
 {
 	int i = 0;
 	int j = 0;

diff --git a/code/client/citicore/console/Console.h b/code/client/citicore/console/Console.h
@@ -146,7 +146,7 @@ void ExecuteSingleCommand(const std::string& command);
 
 void ExecuteSingleCommandDirect(const ProgramArguments& arguments);
 
-ProgramArguments Tokenize(const std::string& line);
+CORE_EXPORT ProgramArguments Tokenize(const std::string& line);
 
 void AddToBuffer(const std::string& text);
 

diff --git a/code/components/gta-core-five/component.lua b/code/components/gta-core-five/component.lua
@@ -0,0 +1,6 @@
+return function()
+	filter {}
+	configuration {}
+
+	links 'CitiCore'
+end
diff --git a/code/components/gta-core-five/src/GameInput.cpp b/code/components/gta-core-five/src/GameInput.cpp
@@ -407,12 +407,11 @@ void Binding::Update(rage::ioMapper* mapper)
 				// suppress any missing commands (requested via https://forum.cfx.re/t/1859314/3)
 				if (!m_tag.empty())
 				{
-					auto parsed = ProgramArguments{
-						thisString
-					};
+					auto parsed = console::Tokenize(thisString);
 
 					if (!console::GetDefaultContext()->GetCommandManager()->HasCommand(parsed[0]))
 					{
+						i++;
 						continue;
 					}
 				}