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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ca03802a456e7cf4efd834edfeddc483ac72e4b5
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ca03802a456e7cf4efd834edf...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Apr 29 19:06:05 2021 +0200

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(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/device.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index f3d7cff74bf..813ee773478 100644
--- 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;