Skip to content

Add overflow check to XWB reader #625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
walbourn merged 2 commits into from
Apr 16, 2026
Merged

Add overflow check to XWB reader #625

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b06efd
Add overflow check to XWB reader
walbourn Apr 16, 2026
5b7653d
Add max alignment check
walbourn Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions Audio/WaveBankReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ namespace
constexpr size_t DVD_BLOCK_SIZE = DVD_SECTOR_SIZE * 16;

constexpr size_t ALIGNMENT_MIN = 4;
constexpr size_t ALIGNMENT_MAX = 0xFFFF;
constexpr size_t ALIGNMENT_DVD = DVD_SECTOR_SIZE;

constexpr size_t MAX_DATA_SEGMENT_SIZE = 0xFFFFFFFF;
Expand Down Expand Up @@ -608,7 +609,7 @@ HRESULT WaveBankReader::Impl::Open(const wchar_t* szFileName) noexcept(false)
if (m_data.dwAlignment % DVD_SECTOR_SIZE)
return E_FAIL;
}
else if (m_data.dwAlignment < ALIGNMENT_MIN)
else if ((m_data.dwAlignment < ALIGNMENT_MIN) || (m_data.dwAlignment > ALIGNMENT_MAX))
{
return E_FAIL;
}
Expand All @@ -635,7 +636,14 @@ HRESULT WaveBankReader::Impl::Open(const wchar_t* szFileName) noexcept(false)
}

const DWORD metadataBytes = m_header.Segments[HEADER::SEGIDX_ENTRYMETADATA].dwLength;
if (metadataBytes != (m_data.dwEntryCount * m_data.dwEntryMetaDataElementSize))

uint64_t expectedSize = uint64_t(m_data.dwEntryCount) * m_data.dwEntryMetaDataElementSize;
if (expectedSize > MAX_DATA_SEGMENT_SIZE)
{
return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
}

if (metadataBytes != static_cast<DWORD>(expectedSize))
{
return E_FAIL;
}
Expand All @@ -644,7 +652,13 @@ HRESULT WaveBankReader::Impl::Open(const wchar_t* szFileName) noexcept(false)
const DWORD namesBytes = m_header.Segments[HEADER::SEGIDX_ENTRYNAMES].dwLength;
if (namesBytes > 0)
{
if (namesBytes >= (m_data.dwEntryNameElementSize * m_data.dwEntryCount))
expectedSize = uint64_t(m_data.dwEntryCount) * m_data.dwEntryNameElementSize;
if (expectedSize > UINT32_MAX)
{
return E_FAIL;
}

if (namesBytes >= static_cast<DWORD>(expectedSize))
{
std::unique_ptr<char[]> temp(new (std::nothrow) char[namesBytes]);
if (!temp)
Expand Down
Loading