From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 095ED385840C for ; Mon, 24 Oct 2022 08:49:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 095ED385840C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 3CD691FB42 for ; Mon, 24 Oct 2022 08:49:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1666601354; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Nmy+XHOUJbWZPq6KIsI7CNCj0BKWOhGQ9DkkCBM4c84=; b=lspakGKQ40p8wqKt/OpkWAqk/Sgd26OVpCJ/xa3WMSjA0s1PWc5ApWXzG8U1Nit5D9Ly2H UwMSnZ9WBNMrUfnOvOi0c1kCC3Q8Qy3EI/IUsjjGxdj0R+K5N2xWCtzhwA+dz4YTVuer3g hhtsFOWL6dw0FdWsjiXfyEHaeaPNzeA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1666601354; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Nmy+XHOUJbWZPq6KIsI7CNCj0BKWOhGQ9DkkCBM4c84=; b=PFdrIYM9JuYOB1DTQLpIH9HCBBCuI5YvWb6UP0qQ013The+oQrWh4NEeKB0VicqYTajYdx DX5yv3+c3Vg9E7BA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 290AA13357 for ; Mon, 24 Oct 2022 08:49:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id SGrgCIpRVmMsWgAAMHmgww (envelope-from ) for ; Mon, 24 Oct 2022 08:49:14 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 1/2] [gdb] Fix rethrow exception slicing in pretty_print_insn Date: Mon, 24 Oct 2022 10:49:12 +0200 Message-Id: <20221024084913.19429-2-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221024084913.19429-1-tdevries@suse.de> References: <20221024084913.19429-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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. [1] https://en.cppreference.com/w/cpp/language/throw Tested on x86_64-linux. --- gdb/disasm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) -- 2.35.3