From 78f568bdc6ca3f32684dedc69e08257d5ad55f8a Mon Sep 17 00:00:00 2001 From: Jose Fonseca Date: Wed, 26 Apr 2023 10:10:45 +0100 Subject: [PATCH] wgl: Fix unintentional assignment on assert. Spotted by Nanley Chery. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4427 Reviewed-by: Jesse Natalie Reviewed-by: Charmaine Lee Reviewed-by: Neha Bhende Cc: mesa-stable Part-of: (cherry picked from commit 9105e771afece456835adf911735be0e8d27dc87) --- .pick_status.json | 2 +- src/gallium/frontends/wgl/stw_tls.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 31db25964f9..6b6f4ca86d2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1255,7 +1255,7 @@ "description": "wgl: Fix unintentional assignment on assert.", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/frontends/wgl/stw_tls.c b/src/gallium/frontends/wgl/stw_tls.c index 0e8c177aa66..2a5d3cea477 100644 --- a/src/gallium/frontends/wgl/stw_tls.c +++ b/src/gallium/frontends/wgl/stw_tls.c @@ -306,7 +306,7 @@ stw_tls_get_data(void) } assert(data); - assert(data->dwThreadId = GetCurrentThreadId()); + assert(data->dwThreadId == GetCurrentThreadId()); assert(data->next == NULL); return data;