From 877e5e16996e63ac5d93192d83666071ed47134d Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Tue, 21 Apr 2020 00:13:42 +0200 Subject: [PATCH] Counter-Strike: Doing bound checks with armoury_entity so that maps like cs_huehnerklau work. --- src/server/cstrike/armoury_entity.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/server/cstrike/armoury_entity.cpp b/src/server/cstrike/armoury_entity.cpp index 56eef1f3..aa80d4f7 100644 --- a/src/server/cstrike/armoury_entity.cpp +++ b/src/server/cstrike/armoury_entity.cpp @@ -155,6 +155,12 @@ armoury_entity::armoury_entity(void) break; case "item": m_iItem = g_cstrike_armouryitems[stoi(argv(i+1))]; + + if (m_iItem < 0 || m_iItem >= 19) { + print(sprintf("^1armoury_entity with invalid item %i. ignoring\n", m_iItem)); + remove(this); + return; + } model = sArmouryModels[m_iItem]; break; default: