(svn r3034) -NewGRF: Improve error checking of setting price bases.

1 files changed, 6 insertions, 1 deletions

diff --git a/newgrf.c b/newgrf.c
index 0693bcea1..e0876c8ec 100644
--- a/newgrf.c
+++ b/newgrf.c
@@ -1070,8 +1070,13 @@ static bool GlobalVarChangeInfo(uint gvid, int numinfo, int prop, byte **bufp, i
 		case 0x08: { /* Cost base factor */
 			FOR_EACH_OBJECT {
 				byte factor = grf_load_byte(&buf);
+				uint price = gvid + i;
 
-				SetPriceBaseMultiplier(gvid + i, factor);
+				if (price < NUM_PRICES) {
+					SetPriceBaseMultiplier(price, factor);
+				} else {
+					grfmsg(GMS_WARN, "GlobalVarChangeInfo: Price %d out of range, ignoring.", price);
+				}
 			}
 		} break;
 		default: