system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

wined3d: Only read "*rect_count" when "rects" is non-NULL in wined3d_device_context_get_scissor_rects() (Valgrind).

Browse source 
When "rects" is NULL, "*rect_count" is potentially uninitialised. That's
fairly benign because the resulting "count" value is inconsequential in that
case, but it's also unnecessary, and easy to avoid.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2021-04-29 19:06:05 +02:00 committed by Alexandre Julliard
parent e7ebe3d8d2
commit ca03802a45
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/wined3d/device.c
View file

@ -1722,8 +1722,7 @@ void CDECL wined3d_device_context_get_scissor_rects(const struct wined3d_device_
TRACE("context %p, rect_count %p, rects %p.\n", context, rect_count, rects);
count = rect_count ? min(*rect_count, state->scissor_rect_count) : 1;
if (count && rects)
if (rects && (count = rect_count ? min(*rect_count, state->scissor_rect_count) : 1))
memcpy(rects, state->scissor_rects, count * sizeof(*rects));
if (rect_count)
*rect_count = state->scissor_rect_count;