diff mbox series

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

Message ID 20230325213205.1218549-1-ppluzhnikov@google.com
State Changes Requested
Headers
Series Minor: don't call _dl_debug_update (which can have side effects) inside assert |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

Paul Pluzhnikov March 25, 2023, 9:32 p.m. UTC 
  ---
 elf/dl-open.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Florian Weimer March 25, 2023, 10:09 p.m. UTC | #1 
* Paul Pluzhnikov via Libc-alpha:

> ---
>  elf/dl-open.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/elf/dl-open.c b/elf/dl-open.c
> index 91a2d8a538..d46956ea21 100644
> --- a/elf/dl-open.c
> +++ b/elf/dl-open.c
> @@ -578,7 +578,8 @@ 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 = _dl_debug_update (args->nsid)->r_state;
> +      assert (r_state == RT_CONSISTENT);
>  
>        return;
>      }
> @@ -927,7 +928,8 @@ 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 = _dl_debug_update (args.nsid)->r_state;
> +  assert (r_state == RT_CONSISTENT);
>  
>    /* Release the lock.  */
>    __rtld_lock_unlock_recursive (GL(dl_load_lock));

This needs __attribute__ ((unused)) on r_state to support building
with -DNDEBUG (although I have not tested that).
diff mbox series

Patch

diff --git a/elf/dl-open.c b/elf/dl-open.c
index 91a2d8a538..d46956ea21 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -578,7 +578,8 @@  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 = _dl_debug_update (args->nsid)->r_state;
+      assert (r_state == RT_CONSISTENT);
 
       return;
     }
@@ -927,7 +928,8 @@  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 = _dl_debug_update (args.nsid)->r_state;
+  assert (r_state == RT_CONSISTENT);
 
   /* Release the lock.  */
   __rtld_lock_unlock_recursive (GL(dl_load_lock));