libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ACCESS: Fix crash on inventory item dragging in Amazon: GoE

Browse Source 
Clamp bounding box to valid dimensions when copying to the screen
surface during item dragging.

Fixes #14617
This commit is contained in:
PushmePullyu 2023-09-09 19:40:03 +02:00 committed by Filippos Karapetis
parent c00d9230d2
commit 0c9921b741
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/access/inventory.cpp
View File

@ -425,6 +425,10 @@ void InventoryManager::combineItems() {
screen._topSkip = screen._bottomSkip = 0;
screen._screenYOff = 0;
const Common::Rect screenBounds = screen.getBounds();
const int screenW = screenBounds.width();
const int screenH = screenBounds.height();
Common::Point tempMouse = events._mousePos;
Common::Point lastMouse = events._mousePos;
@ -448,7 +452,7 @@ void InventoryManager::combineItems() {
continue;
lastMouse = events._mousePos;
Common::Rect lastRect(lastBox.x, lastBox.y, lastBox.x + 46, lastBox.y + 35);
Common::Rect lastRect(lastBox.x, lastBox.y, MIN(lastBox.x + 46, screenW), MIN(lastBox.y + 35, screenH));
screen.copyBlock(&_vm->_buffer2, lastRect);
Common::Point newPt;