MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-06-30 08:24:05 +00:00
Code Issues Projects Releases Wiki Activity

Check that texture fit TMEM before load.

Browse Source 
It should prevent out of TMEM bounds read.
This commit is contained in:
Sergey Lipskiy 2022-01-21 20:42:39 +07:00
parent 0d765008d0
commit 7417144f64
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Textures.cpp
View File

@ -20,6 +20,7 @@
#include "Graphics/Context.h"
#include "Graphics/Parameters.h"
#include "DisplayWindow.h"
#include "Log.h"
using namespace std;
using namespace graphics;
@ -1150,6 +1151,19 @@ void doubleTexture(T* pTex, u32 width, u32 height)
}
}
static
bool checkTextureSize(CachedTexture *_pTexture)
{
// Sanity check: size of texture in bytes must not exceed TMEM size.
auto sizeInBytes = ((_pTexture->width * _pTexture->height) << _pTexture->size >> 1);
if (sizeInBytes <= 0x1000)
return true;;
LOG(LOG_ERROR, "%s wrong texture size. width: %d, height: %d, size: %d, bytes: %d",
RSP.romname, _pTexture->width, _pTexture->height, _pTexture->size, sizeInBytes);
return false;
}
void TextureCache::_loadFast(u32 _tile, CachedTexture *_pTexture)
{
u64 ricecrc = 0;
@ -1188,6 +1202,9 @@ void TextureCache::_loadFast(u32 _tile, CachedTexture *_pTexture)
}
_pTexture->textureBytes = (_pTexture->width * _pTexture->height) << sizeShift;
if (!checkTextureSize(_pTexture))
return;
unsigned int totalTexSize = std::max(static_cast<u32>(_pTexture->textureBytes/sizeof(u32) + 8), MIPMAP_TILE_WIDTH)
* (_pTexture->max_level + 1);
@ -1374,6 +1391,9 @@ void TextureCache::_loadAccurate(u32 _tile, CachedTexture *_pTexture)
}
_pTexture->textureBytes = (_pTexture->width * _pTexture->height) << sizeShift;
if (!checkTextureSize(_pTexture))
return;
unsigned int totalTexSize = std::max(static_cast<u32>(_pTexture->textureBytes/sizeof(u32) + 8), MIPMAP_TILE_WIDTH)
* (_pTexture->max_level + 1);