diff options
| author | Travis Howell | 2005-04-13 10:34:47 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-04-13 10:34:47 +0000 |
| commit | d3ea799f23da68077c963ef403a1dabd2ad269a7 (patch) | |
| tree | 50c1e6695594228f3b0cee2cb2d31936f5a077e9 /scumm/intern.h | |
| parent | b8d3bec5681afb05430a070c86fb17d05919dfff (diff) | |
| download | scummvm-rg350-d3ea799f23da68077c963ef403a1dabd2ad269a7.tar.gz scummvm-rg350-d3ea799f23da68077c963ef403a1dabd2ad269a7.tar.bz2 scummvm-rg350-d3ea799f23da68077c963ef403a1dabd2ad269a7.zip | |
_stringBuffer can have mutple strings, ie in pajama2 startup.
Add safety check for buffer size.
svn-id: r17581
Diffstat (limited to 'scumm/intern.h')
| -rw-r--r-- | scumm/intern.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index 364df7fc45..75dae818be 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -752,11 +752,17 @@ protected: #endif const OpcodeEntryV72he *_opcodesV72he; + + int _stringLength, _stringStart; + byte _stringBuffer[4096]; + WizParameters _wizParams; public: ScummEngine_v72he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16]) : ScummEngine_v70he(detector, syst, gs, md5sum) {} + virtual void scummInit(); + protected: virtual void setupOpcodes(); virtual void executeOpcode(byte i); @@ -796,7 +802,7 @@ protected: virtual void decodeParseString(int a, int b); void decodeScriptString(byte *dst, bool scriptString = false); - void copyScriptString(byte *dst); + void copyScriptString(byte *dst, int dstSize); byte *heFindResourceData(uint32 tag, byte *ptr); byte *heFindResource(uint32 tag, byte *ptr); |