ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d9: Use ARRAY_SIZE in d3d9_device_GetStreamSource(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-02-19 09:53:50 -06:00 committed by Alexandre Julliard
parent 6b35cd2903
commit bd58d1327a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/d3d9/device.c
View File

@ -3709,6 +3709,7 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface,
UINT stream_idx, IDirect3DVertexBuffer9 **buffer, UINT *offset, UINT *stride) UINT stream_idx, IDirect3DVertexBuffer9 **buffer, UINT *offset, UINT *stride)
{ {
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
const struct wined3d_stateblock_state *state;
const struct wined3d_stream_state *stream; const struct wined3d_stream_state *stream;
struct d3d9_vertexbuffer *buffer_impl; struct d3d9_vertexbuffer *buffer_impl;
@ -3718,14 +3719,15 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface,
if (!buffer) if (!buffer)
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
if (stream_idx > WINED3D_MAX_STREAMS) if (stream_idx >= ARRAY_SIZE(state->streams))
{ {
WARN("Stream index %u out of range.\n", stream_idx); WARN("Stream index %u out of range.\n", stream_idx);
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
wined3d_mutex_lock(); wined3d_mutex_lock();
stream = &wined3d_stateblock_get_state(device->state)->streams[stream_idx]; state = wined3d_stateblock_get_state(device->state);
stream = &state->streams[stream_idx];
if (stream->buffer) if (stream->buffer)
{ {
buffer_impl = wined3d_buffer_get_parent(stream->buffer); buffer_impl = wined3d_buffer_get_parent(stream->buffer);