From 31daa956d62b39429cb6638ed3fb549ac488833a Mon Sep 17 00:00:00 2001
From: Colin Snover
Date: Sat, 31 Dec 2016 20:39:57 -0600
Subject: SCI: Implement bounds-checked reads of game resources

---
 engines/sci/graphics/palette32.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/sci/graphics/palette32.h')

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));
 	}
 };
 
-- 
cgit v1.2.3