wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Introduce a vkd3d_bound_range() helper.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-07-26 15:51:28 -05:00 committed by Alexandre Julliard
parent 9f0b475583
commit bcf272aa0b
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -127,6 +127,7 @@ AS_IF([test "x$with_xcb" != "xno"],
dnl Check for functions dnl Check for functions
VKD3D_CHECK_FUNC([HAVE_BUILTIN_CLZ], [__builtin_clz], [__builtin_clz(0)]) VKD3D_CHECK_FUNC([HAVE_BUILTIN_CLZ], [__builtin_clz], [__builtin_clz(0)])
VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popcount(0)]) VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popcount(0)])
VKD3D_CHECK_FUNC([HAVE_BUILTIN_ADD_OVERFLOW], [__builtin_add_overflow], [__builtin_add_overflow(0, 0, (int *)0)])
VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)])
VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)])

11
include/private/vkd3d_common.h
View File

@ -134,6 +134,17 @@ static inline void *vkd3d_memmem( const void *haystack, size_t haystack_len, con
return NULL; return NULL;
} }
static inline bool vkd3d_bound_range(size_t start, size_t count, size_t limit)
{
#ifdef HAVE_BUILTIN_ADD_OVERFLOW
size_t sum;
return !__builtin_add_overflow(start, count, &sum) && sum <= limit;
#else
return start <= limit && count <= limit - start;
#endif
}
static inline int ascii_isupper(int c) static inline int ascii_isupper(int c)
{ {
return 'A' <= c && c <= 'Z'; return 'A' <= c && c <= 'Z';

4
libs/vkd3d/command.c
View File

@ -4422,7 +4422,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi
null_resources = &list->device->null_resources; null_resources = &list->device->null_resources;
gpu_va_allocator = &list->device->gpu_va_allocator; gpu_va_allocator = &list->device->gpu_va_allocator;
if (start_slot >= ARRAY_SIZE(list->strides) || view_count > ARRAY_SIZE(list->strides) - start_slot) if (!vkd3d_bound_range(start_slot, view_count, ARRAY_SIZE(list->strides)))
{ {
WARN("Invalid start slot %u / view count %u.\n", start_slot, view_count); WARN("Invalid start slot %u / view count %u.\n", start_slot, view_count);
return; return;
@ -4477,7 +4477,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SOSetTargets(ID3D12GraphicsComm
return; return;
} }
if (start_slot >= ARRAY_SIZE(buffers) || view_count > ARRAY_SIZE(buffers) - start_slot) if (!vkd3d_bound_range(start_slot, view_count, ARRAY_SIZE(buffers)))
{ {
WARN("Invalid start slot %u / view count %u.\n", start_slot, view_count); WARN("Invalid start slot %u / view count %u.\n", start_slot, view_count);
return; return;

3
libs/vkd3d/device.c
View File

@ -3515,8 +3515,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i
array_size = d3d12_resource_desc_get_layer_count(desc); array_size = d3d12_resource_desc_get_layer_count(desc);
if (first_sub_resource >= desc->MipLevels * array_size if (!vkd3d_bound_range(first_sub_resource, sub_resource_count, desc->MipLevels * array_size))
|| sub_resource_count > desc->MipLevels * array_size - first_sub_resource)
{ {
WARN("Invalid sub-resource range %u-%u for resource.\n", first_sub_resource, sub_resource_count); WARN("Invalid sub-resource range %u-%u for resource.\n", first_sub_resource, sub_resource_count);
return; return;