Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-09 11:40:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't allow TGA reader to read images larger than 4GB even in 64-bit (#440)

Browse Source
This commit is contained in:
Chuck Walbourn 2024-01-17 23:23:39 -08:00 committed by GitHub
parent 4790ba43e3
commit eb172c521a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DirectXTex/DirectXTex.h
View File

@ -115,6 +115,9 @@ namespace DirectX
CP_FLAGS_8BPP = 0x40000, CP_FLAGS_8BPP = 0x40000,
// Override with a legacy 8 bits-per-pixel format size // Override with a legacy 8 bits-per-pixel format size
CP_FLAGS_LIMIT_4GB = 0x10000000,
// Don't allow pixel allocations in excess of 4GB (always true for 32-bit)
}; };
HRESULT __cdecl ComputePitch( HRESULT __cdecl ComputePitch(

2
DirectXTex/DirectXTexHDR.cpp
View File

@ -715,7 +715,7 @@ HRESULT DirectX::LoadFromHDRMemory(const void* pSource, size_t size, TexMetadata
if (remaining == 0) if (remaining == 0)
return E_FAIL; return E_FAIL;
hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1); hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1, CP_FLAGS_LIMIT_4GB);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;

6
DirectXTex/DirectXTexImage.cpp
View File

@ -123,6 +123,12 @@ HRESULT DirectX::Internal::DetermineImageArray(
} }
#else #else
static_assert(sizeof(size_t) == 8, "Not a 64-bit platform!"); static_assert(sizeof(size_t) == 8, "Not a 64-bit platform!");
if ((cpFlags & CP_FLAGS_LIMIT_4GB) && (totalPixelSize > UINT32_MAX))
{
nImages = pixelSize = 0;
return HRESULT_E_ARITHMETIC_OVERFLOW;
}
#endif #endif
nImages = nimages; nImages = nimages;

4
DirectXTex/DirectXTexTGA.cpp
View File

@ -1683,7 +1683,7 @@ HRESULT DirectX::LoadFromTGAMemory(
const void* pPixels = static_cast<const uint8_t*>(pSource) + offset + paletteOffset; const void* pPixels = static_cast<const uint8_t*>(pSource) + offset + paletteOffset;
hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1); hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1, CP_FLAGS_LIMIT_4GB);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
@ -1856,7 +1856,7 @@ HRESULT DirectX::LoadFromTGAFile(
#endif #endif
} }
hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1); hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1, CP_FLAGS_LIMIT_4GB);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;