From: Tom de Vries Date: Mon, 24 Oct 2022 12:20:49 +0000 (+0200) Subject: [gdb] Fix rethrow exception slicing in pretty_print_insn X-Git-Tag: gdb-13-branchpoint~740 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a9c805dfd0dd9a284b30ec0563e4dc1ab5b16c4;p=thirdparty%2Fbinutils-gdb.git [gdb] Fix rethrow exception slicing in pretty_print_insn The preferred way of rethrowing an exception is by using throw without expression, because it avoids object slicing of the exception [1]. Fix this in gdb_pretty_print_disassembler::pretty_print_insn. Tested on x86_64-linux. [1] https://en.cppreference.com/w/cpp/language/throw Approved-By: Andrew Burgess --- diff --git a/gdb/disasm.c b/gdb/disasm.c index de44aac3263..60f95c398a9 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -445,7 +445,7 @@ gdb_pretty_print_disassembler::pretty_print_insn (const struct disasm_insn *insn size = m_di.print_insn (pc); gdb_assert (size > 0); } - catch (const gdb_exception &ex) + catch (const gdb_exception &) { /* An exception was thrown while disassembling the instruction. However, the disassembler might still have written something @@ -454,7 +454,7 @@ gdb_pretty_print_disassembler::pretty_print_insn (const struct disasm_insn *insn object destructor as the write itself might throw an exception if the pager kicks in, and the user selects quit. */ write_out_insn_buffer (); - throw ex; + throw; } if ((flags & (DISASSEMBLY_RAW_INSN | DISASSEMBLY_RAW_BYTES)) != 0)