libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-10 21:03:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MYST3: Fix an out of bounds read in the magnet effect

Browse Source 
Fixes #1249.
This commit is contained in:
Bastien Bouclet 2018-06-09 08:41:23 +02:00
parent 88fd362b8f
commit 6e4fe84f58
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engines/myst3/effects.cpp
View File

@ -436,7 +436,7 @@ MagnetEffect::MagnetEffect(Myst3Engine *vm) :
}
MagnetEffect::~MagnetEffect() {
delete _shakeStrength;
}
MagnetEffect *MagnetEffect::create(Myst3Engine *vm, uint32 id) {
@ -457,10 +457,8 @@ bool MagnetEffect::update() {
_lastSoundId = 0;
_vm->_state->setMagnetEffectUnk3(0);
if (_shakeStrength) {
delete _shakeStrength;
_shakeStrength = nullptr;
}
delete _shakeStrength;
_shakeStrength = nullptr;
return false;
}
@ -473,10 +471,7 @@ bool MagnetEffect::update() {
if (!desc)
error("Magnet effect support file %d does not exist", _vm->_state->getMagnetEffectNode());
if (_shakeStrength) {
delete _shakeStrength;
}
delete _shakeStrength;
_shakeStrength = desc->getData();
}
@ -534,9 +529,10 @@ void MagnetEffect::apply(Graphics::Surface *src, Graphics::Surface *dst, Graphic
uint8 maskValue = *maskPtr;
if (maskValue != 0) {
uint32 displacement = _verticalDisplacement[(maskValue + position) % 256];
int32 displacement = _verticalDisplacement[(maskValue + position) % 256];
int32 displacedY = CLIP<int32>(y + displacement, 0, src->h - 1);
uint32 srcValue1 = *(uint32 *) src->getBasePtr(x, y + displacement);
uint32 srcValue1 = *(uint32 *) src->getBasePtr(x, displacedY);
uint32 srcValue2 = *(uint32 *) src->getBasePtr(x, y);
#ifdef SCUMM_BIG_ENDIAN