server: fix input validation mistake

citizenfx · Dec 13, 2018 · 56c7e14 · 56c7e14
1 parent 7505534
commit 56c7e14
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -60,7 +60,7 @@ build_proot_linux:
       - fx.tar.xz
   except:
     - tags
-    - master
+    #- master
     - feature/update-to-1365
     - feature/cloning-stuff-releng
   tags:

diff --git a/code/components/citizen-server-impl/src/ServerResources.cpp b/code/components/citizen-server-impl/src/ServerResources.cpp
@@ -72,6 +72,12 @@ static void HandleServerEvent(fx::ServerInstanceBase* instance, const std::share
 {
 	uint16_t eventNameLength = buffer.Read<uint16_t>();
 
+	// validate input
+	if (eventNameLength <= 0 || eventNameLength > std::numeric_limits<uint16_t>::max())
+	{
+		return;
+	}
+
 	std::vector<char> eventNameBuffer(eventNameLength - 1);
 	buffer.Read(eventNameBuffer.data(), eventNameBuffer.size());
 	buffer.Read<uint8_t>();