libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 06:41:51 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

LASTEXPRESS: Fix potential out-of-bounds read. CID 1003992

Browse Source
This commit is contained in:
Littleboy 2014-06-11 23:35:57 -04:00
parent 94861cd73c
commit ae12264c5f
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engines/lastexpress/game/inventory.cpp
View File

@ -40,7 +40,6 @@
#include "lastexpress/lastexpress.h"
#include "lastexpress/resource.h"
namespace LastExpress {
Inventory::Inventory(LastExpressEngine *engine) : _engine(engine), _selectedItem(kItemNone), _highlightedItemIndex(0), _itemsShown(0),
@ -534,18 +533,18 @@ Common::String Inventory::toString() {
// Private methods
//////////////////////////////////////////////////////////////////////////
InventoryItem Inventory::getFirstExaminableItem() const {
int index = 0;
InventoryEntry entry = _entries[index];
while (!entry.inPocket || !entry.cursor || entry.floating) {
do {
InventoryEntry entry = _entries[index];
// Check if it is an examinable item
if (entry.inPocket && entry.cursor && !entry.floating)
return (InventoryItem)index;
index++;
entry = _entries[index];
} while (index < kPortraitOriginal);
if (index >= kPortraitOriginal)
return kItemNone;
}
return (InventoryItem)index;
return kItemNone;
}
bool Inventory::isItemSceneParameter(InventoryItem item) const {