From 902288bc00d54c9bac8a0d25ebffab100a99c566 Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 31 Jan 2018 23:23:21 +0000 Subject: [PATCH] * elf.c (elf_add): Close descriptor if we use a debugfile. * btest.c (check_open_files): New static function. (main): Call check_open_files. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@257275 138bc75d-0d04-0410-961f-82ee72b054a4 --- libbacktrace/ChangeLog | 6 ++++++ libbacktrace/btest.c | 22 ++++++++++++++++++++++ libbacktrace/elf.c | 22 ++++++++++++++++++---- 3 files changed, 46 insertions(+), 4 deletions(-) diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index bb449e4d8ac..9ebce200e37 100644 --- a/libbacktrace/ChangeLog +++ b/libbacktrace/ChangeLog @@ -1,3 +1,9 @@ +2018-01-31 Ian Lance Taylor + + * elf.c (elf_add): Close descriptor if we use a debugfile. + * btest.c (check_open_files): New static function. + (main): Call check_open_files. + 2018-01-25 Ian Lance Taylor * elf.c (elf_open_debugfile_by_debuglink): Don't check CRC if the diff --git a/libbacktrace/btest.c b/libbacktrace/btest.c index 5520699aac7..1348d54da50 100644 --- a/libbacktrace/btest.c +++ b/libbacktrace/btest.c @@ -37,6 +37,7 @@ POSSIBILITY OF SUCH DAMAGE. */ #include #include #include +#include #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 **argv) #endif #endif + check_open_files (); + exit (failures ? EXIT_FAILURE : EXIT_SUCCESS); } diff --git a/libbacktrace/elf.c b/libbacktrace/elf.c index 6403c08fa89..3ee1dbeaf79 100644 --- a/libbacktrace/elf.c +++ b/libbacktrace/elf.c @@ -2929,12 +2929,19 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor, 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, const char *filename, int descriptor, 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; } } -- 2.11.4.GIT