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

Properly guarding Script::getOffset() and adding a reverse operation

Browse Source 
svn-id: r41782
This commit is contained in:
Sven Hesse 2009-06-22 20:51:34 +00:00
parent 4ab4517016
commit c31b79b7c9
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/gob/expression.cpp
View File

@ -94,8 +94,7 @@ byte *Expression::decodePtr(int32 n) {
switch (n >> 28) { switch (n >> 28) {
case kExecPtr: case kExecPtr:
ptr = _vm->_game->_script->getData(); return _vm->_game->_script->getData((n & 0x0FFFFFFF));
break;
case kInterVar: case kInterVar:
ptr = (byte *) _vm->_inter->_variables->getAddressOff8(0); ptr = (byte *) _vm->_inter->_variables->getAddressOff8(0);
break; break;

12
engines/gob/script.cpp
View File

@ -123,9 +123,21 @@ int32 Script::getOffset(byte *ptr) {
if (!_totData) if (!_totData)
return -1; return -1;
if ((ptr < _totData) || (ptr >= (_totData + _totSize)))
return -1;
return ptr - _totData; return ptr - _totData;
} }
byte *Script::getData(int32 offset) {
if (!_totData)
return 0;
if ((offset < 0) || (((uint32) offset) >= _totSize))
return 0;
return _totData + offset;
}
byte *Script::getData() { byte *Script::getData() {
return _totData; return _totData;
} }

3
engines/gob/script.h
View File

@ -90,6 +90,9 @@ public:
/** Returns the offset the specified pointer is within the script data. */ /** Returns the offset the specified pointer is within the script data. */
int32 getOffset(byte *ptr); int32 getOffset(byte *ptr);
/** Returns the data pointer to the offset. */
byte *getData(int32 offset);
/** Returns the raw data pointer. */ /** Returns the raw data pointer. */
byte *getData(); byte *getData();