wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/dxbc: Validate and skip the signature section header size.

Browse Source 
Silences a very common warning.
This commit is contained in:
Conor McCarthy
2023-03-07 14:06:36 +10:00
committed by Alexandre Julliard
parent 3b5316be82
commit 9f6e6d3fcd
Notes: Alexandre Julliard 2023-03-08 21:51:46 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/113
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libs/vkd3d-shader/dxbc.c
View File

@@ -1709,6 +1709,9 @@ static void skip_dword_unknown(const char **ptr, unsigned int count)
unsigned int i; unsigned int i;
uint32_t d; uint32_t d;
if (!count)
return;
WARN("Skipping %u unknown DWORDs:\n", count); WARN("Skipping %u unknown DWORDs:\n", count);
for (i = 0; i < count; ++i) for (i = 0; i < count; ++i)
{ {
@@ -1922,9 +1925,9 @@ static int shader_parse_signature(const struct vkd3d_shader_dxbc_section_desc *s
bool has_stream_index, has_min_precision; bool has_stream_index, has_min_precision;
struct vkd3d_shader_signature_element *e; struct vkd3d_shader_signature_element *e;
const char *data = section->data.code; const char *data = section->data.code;
uint32_t count, header_size;
const char *ptr = data; const char *ptr = data;
unsigned int i; unsigned int i;
uint32_t count;
if (!require_space(0, 2, sizeof(uint32_t), section->data.size)) if (!require_space(0, 2, sizeof(uint32_t), section->data.size))
{ {
@@ -1937,7 +1940,17 @@ static int shader_parse_signature(const struct vkd3d_shader_dxbc_section_desc *s
read_dword(&ptr, &count); read_dword(&ptr, &count);
TRACE("%u elements.\n", count); TRACE("%u elements.\n", count);
skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000008. */ read_dword(&ptr, &header_size);
i = header_size / sizeof(uint32_t);
if (align(header_size, sizeof(uint32_t)) != header_size || i < 2
|| !require_space(2, i - 2, sizeof(uint32_t), section->data.size))
{
WARN("Invalid header size %#x.\n", header_size);
vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_DXBC_INVALID_SIGNATURE,
"Signature header size %#x is invalid.\n", header_size);
return VKD3D_ERROR_INVALID_ARGUMENT;
}
skip_dword_unknown(&ptr, i - 2);
if (!require_space(ptr - data, count, 6 * sizeof(uint32_t), section->data.size)) if (!require_space(ptr - data, count, 6 * sizeof(uint32_t), section->data.size))
{ {