diff options
author | Jan Beulich <jbeulich@suse.com> | 2023-04-24 10:37:12 +0200 |
---|---|---|
committer | Jan Beulich <jbeulich@suse.com> | 2023-04-24 10:37:12 +0200 |
commit | 983db9932a302f9e2ae1f1d4fd7c3149560bc269 (patch) | |
tree | 2872636329ab50a253468a0eb4327e79481f1fb9 | |
parent | d4a174a5cbb794143164897a4e8a08972fd251a1 (diff) | |
download | gdb-983db9932a302f9e2ae1f1d4fd7c3149560bc269.zip gdb-983db9932a302f9e2ae1f1d4fd7c3149560bc269.tar.gz gdb-983db9932a302f9e2ae1f1d4fd7c3149560bc269.tar.bz2 |
x86: work around compiler diagnosing dangling pointer
For quite come time print_insn() has been storing the address of a local
variable into info->private_data. Since the compiler can't know that the
field won't be accessed again after print_insn() returns, it may kind of
legitimately diagnose this. And recent enough gcc does as of the
introduction of the fetch_error() return paths (replacing setjmp()-based
error handling).
Utilizing that neither prefix_name() nor i386_dis_printf() actually use
info->private_data, zap the pointer in fetch_error(), after having
retrieved it for local use.
-rw-r--r-- | opcodes/i386-dis.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c index f021bda..fc0515c 100644 --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -345,6 +345,12 @@ fetch_error (const instr_info *ins) const struct dis_private *priv = ins->info->private_data; const char *name = NULL; + /* Our caller has put a pointer to a local variable in info->private_data + and it is going to return right after this function has returned. Some + compilers diagnose this as a dangling pointer. Zap the pointer here to + avoid needing to do so on all involved return paths in the caller. */ + ins->info->private_data = NULL; + if (ins->codep <= priv->the_buffer) return -1; |