Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-04 04:16:12 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

texconv: Fix PFM reader to avoid overread of buffer (#413)

Browse Source 
* texconv: Fix PFM reader to avoid overread of buffer

* More code review

* Max memory usage

* YAML fix
This commit is contained in:
Chuck Walbourn
2023-11-09 20:10:12 -08:00
committed by GitHub
parent 3aebd48c6f
commit 282812b973
5 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Texconv/PortablePixMap.cpp
View File

@@ -264,7 +264,7 @@ HRESULT __cdecl LoadFromPortablePixMap(
if (u > INT32_MAX)
{
return HRESULT_FROM_WIN32(ERROR_FILE_TOO_LARGE);
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
}
width = u;
@@ -277,7 +277,13 @@ HRESULT __cdecl LoadFromPortablePixMap(
if (u > INT32_MAX)
{
return HRESULT_FROM_WIN32(ERROR_FILE_TOO_LARGE);
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
}
uint64_t sizeBytes = uint64_t(width) * uint64_t(u);
if (sizeBytes > UINT32_MAX)
{
HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
}
if (metadata)
@@ -473,7 +479,7 @@ HRESULT __cdecl LoadFromPortablePixMapHDR(
size_t len = 0;
while (pfmSize > 0)
{
len = FindEOL(pData, 256);
len = FindEOL(pData, std::min<size_t>(256, pfmSize));
if (!len)
return E_FAIL;
@@ -498,9 +504,15 @@ HRESULT __cdecl LoadFromPortablePixMapHDR(
if (sscanf_s(dataStr, "%zu %zu%s", &width, &height, junkStr, 256) != 2)
return E_FAIL;
if ((width > INT32_MAX) || (height > UINT32_MAX))
if ((width > INT32_MAX) || (height > INT32_MAX))
{
return HRESULT_FROM_WIN32(ERROR_FILE_TOO_LARGE);
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
}
uint64_t sizeBytes = uint64_t(width) * uint64_t(height);
if (sizeBytes > UINT32_MAX)
{
HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
}
pData += len + 1;
@@ -516,7 +528,7 @@ HRESULT __cdecl LoadFromPortablePixMapHDR(
len = 0;
while (pfmSize > 0)
{
len = FindEOL(pData, 256);
len = FindEOL(pData, std::min<size_t>(256, pfmSize));
if (!len)
return E_FAIL;
@@ -550,8 +562,8 @@ HRESULT __cdecl LoadFromPortablePixMapHDR(
if (!pfmSize)
return E_FAIL;
const size_t scanline = width * (half16 ? sizeof(uint16_t) : sizeof(float)) * (monochrome ? 1 : 3);
if (pfmSize < scanline * height)
const uint64_t scanline = uint64_t(width) * (half16 ? sizeof(uint16_t) : sizeof(float)) * (monochrome ? 1 : 3);
if (uint64_t(pfmSize) < (scanline * uint64_t(height)))
return HRESULT_FROM_WIN32(ERROR_HANDLE_EOF);
if (metadata)
@@ -570,7 +582,6 @@ HRESULT __cdecl LoadFromPortablePixMapHDR(
auto img = image.GetImage(0, 0, 0);
if (half16)
{
auto sptr = reinterpret_cast<const uint16_t*>(pData);