wined3d: Only read "*rect_count" when "rects" is non-NULL in…

wined3d: Only read "*rect_count" when "rects" is non-NULL in wined3d_device_context_get_scissor_rects() (Valgrind). 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>

wined3d: Only read "*rect_count" when "rects" is non-NULL in…
ca03802a · Henri Verbeet · Alexandre Julliard · e7ebe3d8 · ca03802a
Commit ca03802a authored Apr 29, 2021 by Henri Verbeet Committed by Alexandre Julliard Apr 29, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

device.c dlls/wined3d/device.c +1 -2

No files found.
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -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;