diff options
| author | Colin Snover | 2016-10-09 13:47:33 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-10-09 13:52:04 -0500 |
| commit | d0ec919fb703b8016d55bab8316068350c27e84b (patch) | |
| tree | 67492381a1d4ebcdb6209a2f5840859dc5b8e25f /engines/sci/console.h | |
| parent | 6cc761e72850320e89d3136da4b4ec686fd784db (diff) | |
| download | scummvm-rg350-d0ec919fb703b8016d55bab8316068350c27e84b.tar.gz scummvm-rg350-d0ec919fb703b8016d55bab8316068350c27e84b.tar.bz2 scummvm-rg350-d0ec919fb703b8016d55bab8316068350c27e84b.zip | |
SCI: Fix crash when attempting to view invalid list, array, bitmap references
Diffstat (limited to 'engines/sci/console.h')
| -rw-r--r-- | engines/sci/console.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/sci/console.h b/engines/sci/console.h index cf85def950..0b87a4408b 100644 --- a/engines/sci/console.h +++ b/engines/sci/console.h @@ -41,7 +41,11 @@ public: Console(SciEngine *engine); virtual ~Console(); - int printObject(reg_t pos); +#ifdef ENABLE_SCI32 + void printArray(reg_t reg); + void printBitmap(reg_t reg); +#endif + int printObject(reg_t reg); private: virtual void preEnter(); @@ -169,7 +173,8 @@ private: void printBasicVarInfo(reg_t variable); bool segmentInfo(int nr); - void printList(List *list); + void printList(reg_t addr); + void printList(const List &list); int printNode(reg_t addr); void hexDumpReg(const reg_t *data, int len, int regsPerLine = 4, int startOffset = 0, bool isArray = false); void printOffsets(int scriptNr, uint16 showType); |