From: James Jones <jejones3141@gmail.com>
Date: Fri, 29 Apr 2022 19:16:37 +0000 (-0500)
Subject: Move assignment out of fr_assert_msg() to pacify Coverity (CID #1504180) (#4479)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b4b00cb869314de1dd581346c245038e959ca8c;p=thirdparty%2Ffreeradius-server.git

Move assignment out of fr_assert_msg() to pacify Coverity (CID #1504180) (#4479)
---

diff --git a/src/lib/server/module.c b/src/lib/server/module.c
index 47c987e64f0..c598f081080 100644
--- a/src/lib/server/module.c
+++ b/src/lib/server/module.c
@@ -877,8 +877,8 @@ static int _module_instance_free(module_instance_t *mi)
 		 *
 		 *	Assert that the mutex is not held.
 		 */
-		fr_assert_msg((ret = pthread_mutex_trylock(&mi->mutex)) == 0,
-			      "Failed locking module mutex during exit: %s", fr_syserror(ret));
+		ret = pthread_mutex_trylock(&mi->mutex);
+		fr_assert_msg(ret == 0, "Failed locking module mutex during exit: %s", fr_syserror(ret));
 		pthread_mutex_unlock(&mi->mutex);
 #endif
 		pthread_mutex_destroy(&mi->mutex);