From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id +U7nF7nZr2pe+SUAWB0awg (envelope-from ) for ; Sun, 20 Sep 2026 09:03:53 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=r/aT1ic1; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Bz9CaFmq; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=YTGMUyLT; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=G5hJwj6l; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 5DB581E051; Sun, 20 Sep 2026 09:03:53 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id E51131E01F for ; Sun, 20 Sep 2026 09:03:52 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1B8384B9DB50 for ; Sun, 20 Sep 2026 13:03:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1B8384B9DB50 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=r/aT1ic1; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Bz9CaFmq; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=YTGMUyLT; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=G5hJwj6l Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 5065F4BA23FD for ; Sun, 20 Sep 2026 13:03:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5065F4BA23FD Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5065F4BA23FD Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1789909384; cv=none; b=xr4lYQZfGLthyPwuwKnhUX5R3NVx2Gj8s4lXK8UXE2ph4rWEZxEdBBuTiqa4GYv+trFCnZJ1NyFWb4g8NHbWmcgXgNldq26WB9msv1ZahL3uUkoKNcvN9ZtxzQcJmIUWtmkbEjnIBZV5AmUSjD+ieQ/pRypF9QFFdsacmJvjJYo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1789909384; c=relaxed/simple; bh=9V5877cqXZKvjjmRTa+3q6xQXjUjDZDMpJS81V0UmeY=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=auMZ577AdK0zc1/RdSvua66KQX3ysAIAPGacfAgDKQghOEO+1n85lOtHBwy5DGEinCEK2JtklLodJoDQlxg/g53jiihPCm3fJB4KqdJlZ6b+MbQ9tvI07OLaWWFysAlvfobwjktEvIOV1UrBh+AsW21vw/BO3kdQi00q6vp2lAo= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=r/aT1ic1; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Bz9CaFmq; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=YTGMUyLT; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=G5hJwj6l DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5065F4BA23FD Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 2F46F21BC6 for ; Sun, 20 Sep 2026 13:02:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1789909379; 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=iqZGpA46ynlXaQro0Z1ezNdfcYNMB1XQm/DjX2a8t7c=; b=r/aT1ic1p4fKEVwfw7m3emgG6HGiWtWjZPIOG/WSwujl+QfLyEXos3ZUKkjCCzl3MHtrBK pZPhJSazctuluzjGgWDucvMRJILlBhV/Apis+ZfgJ3XIS4R0W4KJYUvDyR7BLRsIn9hUmW A1qhHkg03IHvolgXjaAK7lWjLEuZp14= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1789909379; 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=iqZGpA46ynlXaQro0Z1ezNdfcYNMB1XQm/DjX2a8t7c=; b=Bz9CaFmqG4F10NMqs7NgaTW+4RGjBLboy5CIQQD/kEKBbqRgV1ch4rKz+0lTi119XgVFGa HgwGCgUst5/PbABA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=YTGMUyLT; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=G5hJwj6l DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1789909375; 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=iqZGpA46ynlXaQro0Z1ezNdfcYNMB1XQm/DjX2a8t7c=; b=YTGMUyLTNArQTBn2QFQmvJ6N9sYpZ0InjJxk9wxDO9g7yiVuii8xt+7wfItFs5kOxqgvGn 00lMq6DnquHhgyQ0FdVSGkydn0t9+LvOYVWCXlODVYx6tyIjVNVDGhSfhrkB1rOASI2zkv NtGZs1+ciKdtbeiSCGkCBpVGM0ieiBY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1789909375; 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=iqZGpA46ynlXaQro0Z1ezNdfcYNMB1XQm/DjX2a8t7c=; b=G5hJwj6lzG1sYClm9dLAS20cT44prWLIvk/doGUUbvd2DGrlUd682y+ajLs9+A4RfULBeY NEwxbGOYnTS1y7DQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id CB5F5139C7 for ; Sun, 20 Sep 2026 13:02:54 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id ZSczF37Zr2rzEAAAD6G6ig:T3 (envelope-from ) for ; Sun, 20 Sep 2026 13:02:54 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 2/4] [gdb] Use SCOPE_EXIT in tfile_get_traceframe_address Date: Sun, 20 Sep 2026 15:02:52 +0200 Message-ID: <20260920130254.604592-3-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260920130254.604592-1-tdevries@suse.de> References: <20260920130254.604592-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: 2F46F21BC6 X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.de:dkim,suse.de:mid]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[suse.de:+] X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Use SCOPE_EXIT in tfile_get_traceframe_address to protect a cleanup against exceptions. --- gdb/tracefile-tfile.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gdb/tracefile-tfile.c b/gdb/tracefile-tfile.c index 289e00ff531..83d863302f9 100644 --- a/gdb/tracefile-tfile.c +++ b/gdb/tracefile-tfile.c @@ -652,6 +652,12 @@ tfile_get_traceframe_address (off_t tframe_offset) short tpnum; struct tracepoint *tp; off_t saved_offset = cur_offset; + SCOPE_EXIT + { + /* Restore our seek position. */ + cur_offset = saved_offset; + lseek (trace_fd, cur_offset, SEEK_SET); + }; /* FIXME dig pc out of collected registers. */ @@ -667,9 +673,6 @@ tfile_get_traceframe_address (off_t tframe_offset) if (tp != nullptr && tp->has_locations ()) addr = tp->first_loc ().address; - /* Restore our seek position. */ - cur_offset = saved_offset; - lseek (trace_fd, cur_offset, SEEK_SET); return addr; } -- 2.51.0