From a32892578aee7320232212013cd2583d1943414e Mon Sep 17 00:00:00 2001 From: Walter Agazzi Date: Sun, 26 Feb 2023 18:56:23 +0100 Subject: [PATCH] AGS: Common: fail early in negative index from upstream 4d9f1788059b2fdadd3e957a5a260a918458595d --- engines/ags/shared/gui/gui_button.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/ags/shared/gui/gui_button.cpp b/engines/ags/shared/gui/gui_button.cpp index c8a77e5ca56..710c813f9de 100644 --- a/engines/ags/shared/gui/gui_button.cpp +++ b/engines/ags/shared/gui/gui_button.cpp @@ -108,7 +108,7 @@ Rect GUIButton::CalcGraphicRect(bool clipped) { if (IsClippingImage()) return rc; // Main button graphic - if (_GP(spriteset)[CurrentImage] != nullptr) + if (CurrentImage >= 0 && _GP(spriteset)[CurrentImage] != nullptr) rc = SumRects(rc, RectWH(0, 0, get_adjusted_spritewidth(CurrentImage), get_adjusted_spriteheight(CurrentImage))); // Optionally merge with the inventory pic if (_placeholder != kButtonPlace_None && _G(gui_inv_pic) >= 0) {