libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-08 10:51:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

EMI: Fix wrap around of Layers/Frames

Browse Source 
This patch makes sure, that Layer::_frame is smaller than numLayers
of the bitmap in order to prevent out-of-bounds access to
BitmapData::_layers.
This commit is contained in:
Christian Krause 2015-05-16 10:32:36 +02:00
parent 52010ff229
commit b186c21f85
6 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/grim/bitmap.cpp
View File

@ -452,6 +452,11 @@ int Bitmap::getNumImages() const {
return _data->_numImages;
}
int Bitmap::getNumLayers() const {
_data->load();
return _data->_numLayers;
}
void Bitmap::freeData() {
--_data->_refCount;
if (_data->_refCount < 1) {

1
engines/grim/bitmap.h
View File

@ -156,6 +156,7 @@ public:
void setActiveImage(int n);
int getNumImages() const;
int getNumLayers() const;
int getActiveImage() const { return _currImage; }
bool getHasTransparency() const { return _data->_hasTransparency; }
int getFormat() const { return _data->_format; }

11
engines/grim/emi/layer.cpp
View File

@ -44,6 +44,11 @@ void Layer::draw() {
}
void Layer::setFrame(int frame) {
int numframes = _bitmap->getNumLayers();
if (frame >= numframes || frame < 0) {
warning("Layer::setFrame: invalid frame number: %d, numLayers: %d", frame, numframes);
return;
}
_frame = frame;
}
@ -53,10 +58,8 @@ void Layer::setSortOrder(int order) {
void Layer::advanceFrame(int num) {
_frame += num;
int numframes = _bitmap->getNumImages();
while (_frame >= numframes) {
_frame -= numframes;
}
int numframes = _bitmap->getNumLayers();
_frame %= numframes;
}
void Layer::saveState(SaveGame *state) {

1
engines/grim/gfx_opengl.cpp
View File

@ -1163,6 +1163,7 @@ void GfxOpenGL::drawBitmap(const Bitmap *bitmap, int dx, int dy, uint32 layer) {
GLuint *textures = (GLuint *)bitmap->getTexIds();
float *texc = data->_texc;
assert(layer < data->_numLayers);
uint32 offset = data->_layers[layer]._offset;
for (uint32 i = offset; i < offset + data->_layers[layer]._numImages; ++i) {
glBindTexture(GL_TEXTURE_2D, textures[data->_verts[i]._texid]);

1
engines/grim/gfx_opengl_shaders.cpp
View File

@ -1351,6 +1351,7 @@ void GfxOpenGLS::drawBitmap(const Bitmap *bitmap, int dx, int dy, uint32 layer)
shader->use();
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _quadEBO);
assert(layer < data->_numLayers);
uint32 offset = data->_layers[layer]._offset;
for (uint32 i = offset; i < offset + data->_layers[layer]._numImages; ++i) {
glBindTexture(GL_TEXTURE_2D, textures[data->_verts[i]._texid]);

1
engines/grim/gfx_tinygl.cpp
View File

@ -996,6 +996,7 @@ void GfxTinyGL::drawBitmap(const Bitmap *bitmap, int x, int y, uint32 layer) {
Graphics::BlitImage **b = (Graphics::BlitImage **)bitmap->getTexIds();
assert(layer < data->_numLayers);
uint32 offset = data->_layers[layer]._offset;
for (uint32 i = offset; i < offset + data->_layers[layer]._numImages; ++i) {
const BitmapData::Vert &v = data->_verts[i];