From: Paul Pluzhnikov <ppluzhnikov@google.com>
To: libc-alpha@sourceware.org
Cc: Paul Pluzhnikov <ppluzhnikov@google.com>,
Andreas Schwab <schwab@suse.de>
Subject: [PATCH] Minor: don't call _dl_debug_update (which can have side effects) inside assert
Date: Sat, 25 Mar 2023 21:32:06 +0000 [thread overview]
Message-ID: <20230325213205.1218549-1-ppluzhnikov@google.com> (raw)
In-Reply-To: <mvmo7ojwru8.fsf@suse.de>
---
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));
--
2.40.0.348.gf938b09366-goog
next prev parent reply other threads:[~2023-03-25 21:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 12:54 Side effect inside assert macro? Andreas Schwab
2023-03-25 19:48 ` Paul Pluzhnikov
2023-03-25 21:32 ` Paul Pluzhnikov [this message]
2023-03-25 22:09 ` [PATCH] Minor: don't call _dl_debug_update (which can have side effects) inside assert Florian Weimer
2023-03-26 0:24 ` Paul Pluzhnikov
2023-03-26 10:35 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230325213205.1218549-1-ppluzhnikov@google.com \
--to=ppluzhnikov@google.com \
--cc=libc-alpha@sourceware.org \
--cc=schwab@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).