[PATCH 2/4] [gdb] Use SCOPE_EXIT in tfile_get_traceframe_address

[Tom de Vries <tdevries@suse.de>]

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