From 5446094655df842abb4ababac39f34c6342e8da3 Mon Sep 17 00:00:00 2001 From: Philippe Waroquiers Date: Sat, 24 Nov 2018 12:42:24 +0100 Subject: [PATCH] Re-fix leak in source.c (open_source_file). Leak fixed in '8e6a5953e1d Fix 4K leak in open_source_file' has been partially undone by '2179fbc36d23 Return scoped_fd from open_source_file'. Re-add the transfer of current s->fullname to the unique_xmalloc_ptr fullname given to find_and_open_source. --- gdb/ChangeLog | 8 ++++++++ gdb/source.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 90e8d7a5c6..2515a4d0b8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2018-11-24 Philippe Waroquiers + + * source.c (open_source_file): Leak fixed in '8e6a5953e1d Fix 4K + leak in open_source_file' has been partially undone by '2179fbc36d23 + Return scoped_fd from open_source_file'. Re-add the transfer of + current s->fullname to the unique_xmalloc_ptr fullname given + to find_and_open_source. + 2018-11-23 Pedro Alves * gdbthread.h (enum thread_state): Move comments here. diff --git a/gdb/source.c b/gdb/source.c index b38eed5be6..e295fbf49e 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1068,7 +1068,7 @@ open_source_file (struct symtab *s) if (!s) return scoped_fd (-1); - gdb::unique_xmalloc_ptr fullname; + gdb::unique_xmalloc_ptr fullname (s->fullname); s->fullname = NULL; scoped_fd fd = find_and_open_source (s->filename, SYMTAB_DIRNAME (s), &fullname);