From: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Sat, 25 Mar 2023 21:27:01 +0000 (+0000)
Subject: Minor: don't call _dl_debug_update (which can have side effects) inside assert
X-Git-Tag: glibc-2.38~476
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b5e65ef6a442fdccf88d43c3048f98292d85631;p=thirdparty%2Fglibc.git

Minor: don't call _dl_debug_update (which can have side effects) inside assert
---

diff --git a/elf/dl-open.c b/elf/dl-open.c
index 91a2d8a538d..2d985e21d85 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -578,7 +578,9 @@ dl_open_worker_begin (void *a)
       if ((mode & RTLD_GLOBAL) && new->l_global == 0)
 	add_to_global_update (new);
 
-      assert (_dl_debug_update (args->nsid)->r_state == RT_CONSISTENT);
+      const int r_state __attribute__ ((unused))
+        = _dl_debug_update (args->nsid)->r_state;
+      assert (r_state == RT_CONSISTENT);
 
       return;
     }
@@ -927,7 +929,9 @@ no more namespaces available for dlmopen()"));
       _dl_signal_exception (errcode, &exception, NULL);
     }
 
-  assert (_dl_debug_update (args.nsid)->r_state == RT_CONSISTENT);
+  const int r_state __attribute__ ((unused))
+    = _dl_debug_update (args.nsid)->r_state;
+  assert (r_state == RT_CONSISTENT);
 
   /* Release the lock.  */
   __rtld_lock_unlock_recursive (GL(dl_load_lock));