Fix OpenTTD#6966: Only allow switching to a valid company.

btzy · Dec 29, 2018 · 4a255e8 · 4a255e8
1 parent d8f6c80
commit 4a255e8
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/script/api/script_companymode.cpp b/src/script/api/script_companymode.cpp
@@ -10,13 +10,15 @@
 /** @file script_companymode.cpp Implementation of ScriptCompanyMode. */
 
 #include "../../stdafx.h"
+#include "../../company_base.h"
 #include "script_companymode.hpp"
 
 #include "../../safeguards.h"
 
 ScriptCompanyMode::ScriptCompanyMode(int company)
 {
 	if (company < OWNER_BEGIN || company >= MAX_COMPANIES) company = INVALID_COMPANY;
+	if (!::Company::IsValidID(company)) company = INVALID_COMPANY;
 
 	this->last_company = ScriptObject::GetCompany();
 	ScriptObject::SetCompany((CompanyID)company);