diff options
| author | Martin Kiewitz | 2015-06-13 17:18:59 +0200 |
|---|---|---|
| committer | Martin Kiewitz | 2015-06-13 17:18:59 +0200 |
| commit | cacf8fbcb0939f34eecc1b982b767f198a7bed16 (patch) | |
| tree | da4eff9845eba5ac305d27d09f08d0016deca430 /engines/sherlock | |
| parent | 45f27edb0a30b3021084b24fa68f1f4883ba888b (diff) | |
| download | scummvm-rg350-cacf8fbcb0939f34eecc1b982b767f198a7bed16.tar.gz scummvm-rg350-cacf8fbcb0939f34eecc1b982b767f198a7bed16.tar.bz2 scummvm-rg350-cacf8fbcb0939f34eecc1b982b767f198a7bed16.zip | |
SHERLOCK: 3DO: add checks to ccb header reading
verify that height+width from PRE0/PRE1 are correct
security check
Diffstat (limited to 'engines/sherlock')
| -rw-r--r-- | engines/sherlock/image_file.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/engines/sherlock/image_file.cpp b/engines/sherlock/image_file.cpp index 61ed1374e9..512018b170 100644 --- a/engines/sherlock/image_file.cpp +++ b/engines/sherlock/image_file.cpp @@ -391,8 +391,10 @@ void ImageFile3DO::load3DOCelFile(Common::SeekableReadStream &stream) { uint16 ccbPPMP0 = 0; uint16 ccbPPMP1 = 0; uint32 ccbPRE0 = 0; + uint16 ccbPRE0_height = 0; byte ccbPRE0_bitsPerPixel = 0; uint32 ccbPRE1 = 0; + uint16 ccbPRE1_width = 0; uint32 ccbWidth = 0; uint32 ccbHeight = 0; // pixel lookup table @@ -472,6 +474,11 @@ void ImageFile3DO::load3DOCelFile(Common::SeekableReadStream &stream) { ccbPRE0_bitsPerPixel = imagefile3DO_cel_bitsPerPixelLookupTable[ccbPRE0 & 0x07]; if (!ccbPRE0_bitsPerPixel) error("load3DOCelFile: Invalid CCB PRE0 bits per pixel"); + + ccbPRE0_height = ((ccbPRE0 >> 6) & 0x03FF) + 1; + ccbPRE1_width = (ccbPRE1 & 0x03FF) + 1; + assert(ccbPRE0_height == ccbHeight); + assert(ccbPRE1_width == ccbWidth); break; case MKTAG('P', 'L', 'U', 'T'): @@ -603,8 +610,10 @@ void ImageFile3DO::load3DOCelRoomData(Common::SeekableReadStream &stream) { uint16 ccbPPMP0 = 0; uint16 ccbPPMP1 = 0; uint32 ccbPRE0 = 0; + uint16 ccbPRE0_height = 0; byte ccbPRE0_bitsPerPixel = 0; uint32 ccbPRE1 = 0; + uint16 ccbPRE1_width = 0; uint32 ccbWidth = 0; uint32 ccbHeight = 0; // cel data @@ -636,6 +645,11 @@ void ImageFile3DO::load3DOCelRoomData(Common::SeekableReadStream &stream) { if (!ccbPRE0_bitsPerPixel) error("load3DOCelRoomData: Invalid CCB PRE0 bits per pixel"); + ccbPRE0_height = ((ccbPRE0 >> 6) & 0x03FF) + 1; + ccbPRE1_width = (ccbPRE1 & 0x03FF) + 1; + assert(ccbPRE0_height == ccbHeight); + assert(ccbPRE1_width == ccbWidth); + if (ccbPRE0_bitsPerPixel != 16) { // We currently support 16-bits per pixel in here error("load3DOCelRoomData: bits per pixel < 16?!?!?"); |