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

Improved validation where WIC requires a cast to UINT for pitch/imageSize

Browse Source
This commit is contained in:
Chuck Walbourn 2018-07-27 01:02:56 -07:00
parent 9ff3835f20
commit 2c82697c1b
7 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DirectXTex/BCDirectCompute.cpp
View File

@ -232,7 +232,12 @@ HRESULT GPUCompressBC::Prepare(size_t width, size_t height, DWORD flags, DXGI_FO
return E_POINTER;
// Create structured buffers
size_t bufferSize = num_blocks * sizeof(BufferBC6HBC7);
uint64_t sizeInBytes = uint64_t(num_blocks) * sizeof(BufferBC6HBC7);
if (sizeInBytes >= UINT32_MAX)
return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
auto bufferSize = static_cast<size_t>(sizeInBytes);
{
D3D11_BUFFER_DESC desc = {};
desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS | D3D11_BIND_SHADER_RESOURCE;

4
DirectXTex/DirectXTexConvert.cpp
View File

@ -4445,6 +4445,10 @@ namespace
return E_UNEXPECTED;
}
if (srcImage.rowPitch > UINT32_MAX || srcImage.slicePitch > UINT32_MAX
|| destImage.rowPitch > UINT32_MAX || destImage.slicePitch > UINT32_MAX)
return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
ComPtr<IWICBitmap> source;
hr = pWIC->CreateBitmapFromMemory(static_cast<UINT>(srcImage.width), static_cast<UINT>(srcImage.height), pfGUID,
static_cast<UINT>(srcImage.rowPitch), static_cast<UINT>(srcImage.slicePitch),

7
DirectXTex/DirectXTexD3D12.cpp
View File

@ -349,7 +349,7 @@ bool DirectX::IsSupportedTexture(
return false;
{
auto numberOfResources = static_cast<UINT>(arraySize * metadata.mipLevels);
uint64_t numberOfResources = uint64_t(arraySize) * uint64_t(metadata.mipLevels);
if (numberOfResources > D3D12_REQ_SUBRESOURCES)
return false;
}
@ -378,7 +378,7 @@ bool DirectX::IsSupportedTexture(
}
{
auto numberOfResources = static_cast<UINT>(arraySize * metadata.mipLevels);
uint64_t numberOfResources = uint64_t(arraySize) * uint64_t(metadata.mipLevels);
if (numberOfResources > D3D12_REQ_SUBRESOURCES)
return false;
}
@ -395,8 +395,7 @@ bool DirectX::IsSupportedTexture(
return false;
{
auto numberOfResources = static_cast<UINT>(metadata.mipLevels);
if (numberOfResources > D3D12_REQ_SUBRESOURCES)
if (metadata.mipLevels > D3D12_REQ_SUBRESOURCES)
return false;
}
break;

4
DirectXTex/DirectXTexFlipRotate.cpp
View File

@ -35,6 +35,10 @@ namespace
if (!pWIC)
return E_NOINTERFACE;
if (srcImage.rowPitch > UINT32_MAX || srcImage.slicePitch > UINT32_MAX
|| destImage.rowPitch > UINT32_MAX || destImage.slicePitch > UINT32_MAX)
return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
ComPtr<IWICBitmap> source;
HRESULT hr = pWIC->CreateBitmapFromMemory(static_cast<UINT>(srcImage.width), static_cast<UINT>(srcImage.height), pfGUID,
static_cast<UINT>(srcImage.rowPitch), static_cast<UINT>(srcImage.slicePitch),

9
DirectXTex/DirectXTexMipmaps.cpp
View File

@ -361,6 +361,9 @@ namespace DirectX
if (SUCCEEDED(hr))
{
if (img->rowPitch > UINT32_MAX || img->slicePitch > UINT32_MAX)
return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
ComPtr<IWICBitmap> wicBitmap;
hr = EnsureWicBitmapPixelFormat(pWIC, resizedColorWithAlpha.Get(), filter, desiredPixelFormat, wicBitmap.GetAddressOf());
if (SUCCEEDED(hr))
@ -468,6 +471,9 @@ namespace
size_t width = baseImage.width;
size_t height = baseImage.height;
if (baseImage.rowPitch > UINT32_MAX || baseImage.slicePitch > UINT32_MAX)
return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
ComPtr<IWICBitmap> source;
HRESULT hr = pWIC->CreateBitmapFromMemory(static_cast<UINT>(width), static_cast<UINT>(height), pfGUID,
static_cast<UINT>(baseImage.rowPitch), static_cast<UINT>(baseImage.slicePitch),
@ -536,6 +542,9 @@ namespace
if (FAILED(hr))
return hr;
if (img->rowPitch > UINT32_MAX || img->slicePitch > UINT32_MAX)
return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
hr = scaler->Initialize(source.Get(), static_cast<UINT>(width), static_cast<UINT>(height), _GetWICInterp(filter));
if (FAILED(hr))
return hr;

4
DirectXTex/DirectXTexResize.cpp
View File

@ -56,6 +56,10 @@ namespace
if (FAILED(hr))
return hr;
if (srcImage.rowPitch > UINT32_MAX || srcImage.slicePitch > UINT32_MAX
|| destImage.rowPitch > UINT32_MAX || destImage.slicePitch > UINT32_MAX)
return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
ComPtr<IWICBitmap> source;
hr = pWIC->CreateBitmapFromMemory(static_cast<UINT>(srcImage.width), static_cast<UINT>(srcImage.height), pfGUID,
static_cast<UINT>(srcImage.rowPitch), static_cast<UINT>(srcImage.slicePitch),

9
DirectXTex/DirectXTexWIC.cpp
View File

@ -390,6 +390,9 @@ namespace
if (!pWIC)
return E_NOINTERFACE;
if (img->rowPitch > UINT32_MAX || img->slicePitch > UINT32_MAX)
return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
if (memcmp(&convertGUID, &GUID_NULL, sizeof(GUID)) == 0)
{
hr = frame->CopyPixels(nullptr, static_cast<UINT>(img->rowPitch), static_cast<UINT>(img->slicePitch), img->pixels);
@ -459,6 +462,9 @@ namespace
if (!img)
return E_POINTER;
if (img->rowPitch > UINT32_MAX || img->slicePitch > UINT32_MAX)
return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
ComPtr<IWICBitmapFrameDecode> frame;
hr = decoder->GetFrame(static_cast<UINT>(index), frame.GetAddressOf());
if (FAILED(hr))
@ -687,6 +693,9 @@ namespace
if ((image.width > UINT32_MAX) || (image.height > UINT32_MAX))
return E_INVALIDARG;
if (image.rowPitch > UINT32_MAX || image.slicePitch > UINT32_MAX)
return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
hr = frame->SetSize(static_cast<UINT>(image.width), static_cast<UINT>(image.height));
if (FAILED(hr))
return hr;