This patch to libbacktrace closes any debuginfo files that we opened. Bootstrapped and ran libbacktrace tests on x86_64-pc-linux-gnu. This should fix https://golang.org/issue/23626. Committed to mainline.
Ian 2018-01-31 Ian Lance Taylor <i...@golang.org> * elf.c (elf_add): Close descriptor if we use a debugfile. * btest.c (check_open_files): New static function. (main): Call check_open_files.
Index: btest.c =================================================================== --- btest.c (revision 257217) +++ btest.c (working copy) @@ -37,6 +37,7 @@ POSSIBILITY OF SUCH DAMAGE. */ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include "filenames.h" @@ -456,6 +457,25 @@ test5 (void) return failures; } +/* Check that are no files left open. */ + +static void +check_open_files (void) +{ + int i; + + for (i = 3; i < 10; i++) + { + if (close (i) == 0) + { + fprintf (stderr, + "ERROR: descriptor %d still open after tests complete\n", + i); + ++failures; + } + } +} + /* Run all the tests. */ int @@ -474,5 +494,7 @@ main (int argc ATTRIBUTE_UNUSED, char ** #endif #endif + check_open_files (); + exit (failures ? EXIT_FAILURE : EXIT_SUCCESS); } Index: elf.c =================================================================== --- elf.c (revision 257217) +++ elf.c (working copy) @@ -2929,12 +2929,19 @@ elf_add (struct backtrace_state *state, error_callback, data); if (d >= 0) { + int ret; + backtrace_release_view (state, &buildid_view, error_callback, data); if (debuglink_view_valid) backtrace_release_view (state, &debuglink_view, error_callback, data); - return elf_add (state, NULL, d, base_address, error_callback, data, - fileline_fn, found_sym, found_dwarf, 0, 1); + ret = elf_add (state, NULL, d, base_address, error_callback, data, + fileline_fn, found_sym, found_dwarf, 0, 1); + if (ret < 0) + backtrace_close (d, error_callback, data); + else + backtrace_close (descriptor, error_callback, data); + return ret; } } @@ -2953,10 +2960,17 @@ elf_add (struct backtrace_state *state, data); if (d >= 0) { + int ret; + backtrace_release_view (state, &debuglink_view, error_callback, data); - return elf_add (state, NULL, d, base_address, error_callback, data, - fileline_fn, found_sym, found_dwarf, 0, 1); + ret = elf_add (state, NULL, d, base_address, error_callback, data, + fileline_fn, found_sym, found_dwarf, 0, 1); + if (ret < 0) + backtrace_close (d, error_callback, data); + else + backtrace_close(descriptor, error_callback, data); + return ret; } }