diff options
| author | Colin Snover | 2016-12-31 20:39:57 -0600 |
|---|---|---|
| committer | Colin Snover | 2017-03-27 19:42:31 -0500 |
| commit | 31daa956d62b39429cb6638ed3fb549ac488833a (patch) | |
| tree | fa831adefae05d82209b3f565055f7b761ca8691 /engines/sci/graphics/palette32.h | |
| parent | 1298762b7665dc1b7aeedf0271eadfb284309ef1 (diff) | |
| download | scummvm-rg350-31daa956d62b39429cb6638ed3fb549ac488833a.tar.gz scummvm-rg350-31daa956d62b39429cb6638ed3fb549ac488833a.tar.bz2 scummvm-rg350-31daa956d62b39429cb6638ed3fb549ac488833a.zip | |
SCI: Implement bounds-checked reads of game resources
Diffstat (limited to 'engines/sci/graphics/palette32.h')
| -rw-r--r-- | engines/sci/graphics/palette32.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/graphics/palette32.h b/engines/sci/graphics/palette32.h index c4cfb35096..d6d7d0dbd1 100644 --- a/engines/sci/graphics/palette32.h +++ b/engines/sci/graphics/palette32.h @@ -35,7 +35,7 @@ namespace Sci { */ class HunkPalette { public: - HunkPalette(byte *rawPalette); + HunkPalette(const SciSpan<const byte> &rawPalette); /** * Gets the version of the palette. Used to avoid resubmitting a HunkPalette @@ -118,7 +118,7 @@ private: /** * The raw palette data for this hunk palette. */ - byte *_data; + SciSpan<const byte> _data; /** * Returns a struct that describes the palette held by this HunkPalette. The @@ -129,8 +129,8 @@ private: /** * Returns a pointer to the palette data within the hunk palette. */ - byte *getPalPointer() const { - return _data + kHunkPaletteHeaderSize + (2 * _numPalettes); + SciSpan<const byte> getPalPointer() const { + return _data.subspan(kHunkPaletteHeaderSize + (2 * _numPalettes)); } }; |