From 119d62ffb87b8e6fc24d1cfa040586ec94f5655a Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 5 Feb 2015 16:57:09 -0800 Subject: [PATCH] Close fd only if fd != -1 This patch closes fd only if fd != -1. * plugin.c (release_input_file): Set fd to -1 after closing it. (plugin_maybe_claim): Close fd only if fd != -1. --- ld/ChangeLog | 5 +++++ ld/plugin.c | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 0d767babe4d..4ae174b29b0 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2015-02-05 H.J. Lu + + * plugin.c (release_input_file): Set fd to -1 after closing it. + (plugin_maybe_claim): Close fd only if fd != -1. + 2015-02-05 H.J. Lu PR ld/17878 diff --git a/ld/plugin.c b/ld/plugin.c index 28236f2404b..ae0ac8976c4 100644 --- a/ld/plugin.c +++ b/ld/plugin.c @@ -512,10 +512,13 @@ get_view (const void *handle, const void **viewp) static enum ld_plugin_status release_input_file (const void *handle) { - const plugin_input_file_t *input = handle; + plugin_input_file_t *input = (plugin_input_file_t *) handle; ASSERT (called_plugin); if (input->fd != -1) - close (input->fd); + { + close (input->fd); + input->fd = -1; + } return LDPS_OK; } @@ -964,7 +967,7 @@ plugin_maybe_claim (struct ld_plugin_input_file *file, einfo (_("%P%F: %s: plugin reported error claiming file\n"), plugin_error_plugin ()); - if (bfd_check_format (entry->the_bfd, bfd_object)) + if (input->fd != -1 && bfd_check_format (entry->the_bfd, bfd_object)) { /* FIXME: fd belongs to us, not the plugin. IR for GCC plugin, which doesn't need fd after plugin_call_claim_file, is -- 2.30.2