# HG changeset patch
# User frosch <frosch@openttd.org>
# Date 2021-01-10 14:12:06
# Node ID dc757f98ef7c0afe7fc3101faee47f11dfb9ec80
# Parent  c06360c1c21079f4b4eca908dc122258dfe72a95

Fix: [NewGRF] industry variables 69 to 71 did not check, whether the queried cargo is valid.

diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp
--- a/src/newgrf_industries.cpp
+++ b/src/newgrf_industries.cpp
@@ -311,6 +311,7 @@ static uint32 GetCountAndDistanceOfClose
 		case 0x70:
 		case 0x71: {
 			CargoID cargo = GetCargoTranslation(parameter, this->ro.grffile);
+			if (cargo == CT_INVALID) return 0;
 			int index = this->industry->GetCargoProducedIndex(cargo);
 			if (index < 0) return 0; // invalid cargo
 			switch (variable) {
@@ -329,6 +330,7 @@ static uint32 GetCountAndDistanceOfClose
 		case 0x6E:
 		case 0x6F: {
 			CargoID cargo = GetCargoTranslation(parameter, this->ro.grffile);
+			if (cargo == CT_INVALID) return 0;
 			int index = this->industry->GetCargoAcceptedIndex(cargo);
 			if (index < 0) return 0; // invalid cargo
 			if (variable == 0x6E) return this->industry->last_cargo_accepted_at[index];