* [PATCH] Use scoped_restore in varobj.c
@ 2023-04-24 18:27 Tom Tromey
2023-04-24 19:35 ` Simon Marchi
0 siblings, 1 reply; 2+ messages in thread
From: Tom Tromey @ 2023-04-24 18:27 UTC (permalink / raw)
To: gdb-patches; +Cc: Tom Tromey
One spot in varobj.c should use scoped_restore to save and restore
input_radix. Note that the current code may fail to restore it on
error, so this patch fixes a latent bug.
---
gdb/varobj.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/gdb/varobj.c b/gdb/varobj.c
index 2c35b911bad..5a5e55c2d82 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -970,12 +970,12 @@ varobj_set_value (struct varobj *var, const char *expression)
We need to first construct a legal expression for this -- ugh! */
/* Does this cover all the bases? */
struct value *value = NULL; /* Initialize to keep gcc happy. */
- int saved_input_radix = input_radix;
const char *s = expression;
gdb_assert (varobj_editable_p (var));
- input_radix = 10; /* ALWAYS reset to decimal temporarily. */
+ /* ALWAYS reset to decimal temporarily. */
+ auto save_input_radix = make_scoped_restore (&input_radix, 10);
expression_up exp = parse_exp_1 (&s, 0, 0, 0);
try
{
@@ -1022,7 +1022,6 @@ varobj_set_value (struct varobj *var, const char *expression)
'updated' flag. There's no need to optimize that, because return value
of -var-update should be considered an approximation. */
var->updated = install_new_value (var, val, false /* Compare values. */);
- input_radix = saved_input_radix;
return true;
}
--
2.39.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Use scoped_restore in varobj.c
2023-04-24 18:27 [PATCH] Use scoped_restore in varobj.c Tom Tromey
@ 2023-04-24 19:35 ` Simon Marchi
0 siblings, 0 replies; 2+ messages in thread
From: Simon Marchi @ 2023-04-24 19:35 UTC (permalink / raw)
To: Tom Tromey, gdb-patches
On 4/24/23 14:27, Tom Tromey via Gdb-patches wrote:
> One spot in varobj.c should use scoped_restore to save and restore
> input_radix. Note that the current code may fail to restore it on
> error, so this patch fixes a latent bug.
Thanks, LGTM.
Approved-By: Simon Marchi <simon.marchi@efficios.com>
Simon
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-04-24 19:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-24 18:27 [PATCH] Use scoped_restore in varobj.c Tom Tromey
2023-04-24 19:35 ` Simon Marchi
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).