rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-01 08:52:11 +01:00
Code Issues Projects Releases Wiki Activity

[d3d9] Validate pRect dimensions with LockRect

Browse Source
This commit is contained in:
WinterSnowfall 2024-10-11 23:33:38 +03:00 committed by Philip Rebohle
parent 80fbaed291
commit 678ccc721d
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/d3d9/d3d9_surface.cpp
View File

@ -124,7 +124,33 @@ namespace dxvk {
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
D3DBOX box; D3DBOX box;
if (pRect != nullptr) {
if (unlikely(pRect != nullptr)) {
D3DRESOURCETYPE type = m_texture->GetType();
auto& desc = *(m_texture->Desc());
D3D9_FORMAT_BLOCK_SIZE blockSize = GetFormatBlockSize(desc.Format);
bool isBlockAlignedFormat = blockSize.Width > 0 && blockSize.Height > 0;
// The boundaries of pRect are validated for D3DPOOL_DEFAULT surfaces
// with formats which need to be block aligned (mip 0), surfaces created via
// CreateImageSurface and D3D8 cube textures outside of D3DPOOL_DEFAULT
if ((m_mipLevel == 0 && isBlockAlignedFormat && desc.Pool == D3DPOOL_DEFAULT)
|| (desc.Pool == D3DPOOL_SYSTEMMEM && type == D3DRTYPE_SURFACE)
|| (m_texture->Device()->IsD3D8Compatible() &&
desc.Pool != D3DPOOL_DEFAULT && type == D3DRTYPE_CUBETEXTURE)) {
// Negative coordinates
if (pRect->left < 0 || pRect->right < 0
|| pRect->top < 0 || pRect->bottom < 0
// Negative or zero length dimensions
|| pRect->right - pRect->left <= 0
|| pRect->bottom - pRect->top <= 0
// Exceeding surface dimensions
|| static_cast<UINT>(pRect->right) > desc.Width
|| static_cast<UINT>(pRect->bottom) > desc.Height)
return D3DERR_INVALIDCALL;
}
box.Left = pRect->left; box.Left = pRect->left;
box.Right = pRect->right; box.Right = pRect->right;
box.Top = pRect->top; box.Top = pRect->top;