diff options
| author | Nick Clifton <nickc@redhat.com> | 2006-09-27 11:14:59 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2006-09-27 11:14:59 +0000 |
| commit | 70c18b79beffaa44a50ed1ce93ae219f13411c5a (patch) | |
| tree | 8c79c5080335391a28af5c4a13ca8caf1bb323cd | |
| parent | f6c8fecc6fe3d5532691867a7f27820bb1c426a9 (diff) | |
| download | binutils-redhat-70c18b79beffaa44a50ed1ce93ae219f13411c5a.tar.gz | |
* output-file.c (output_file_close): Prevent an infinite loop reporting that stdoutput could not be closed.
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/output-file.c | 14 |
2 files changed, 17 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 6e72db5247..4d49d9b89c 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2006-09-27 Nick Clifton <nickc@redhat.com> + + * output-file.c (output_file_close): Prevent an infinite loop + reporting that stdoutput could not be closed. + 2006-09-26 Mark Shinwell <shinwell@codesourcery.com> Joseph Myers <joseph@codesourcery.com> Ian Lance Taylor <ian@wasabisystems.com> diff --git a/gas/output-file.c b/gas/output-file.c index dfbef1f24d..9603dc4f38 100644 --- a/gas/output-file.c +++ b/gas/output-file.c @@ -53,9 +53,19 @@ output_file_create (char *name) void output_file_close (char *filename) { + bfd_boolean res; + + if (stdoutput == NULL) + return; + /* Close the bfd. */ - if (!bfd_close (stdoutput)) + res = bfd_close (stdoutput); + + /* Prevent an infinite loop - if the close failed we will call as_fatal + which will call xexit() which may call this function again... */ + stdoutput = NULL; + + if (! res) as_fatal (_("can't close %s: %s"), filename, bfd_errmsg (bfd_get_error ())); - stdoutput = NULL; /* Trust nobody! */ } |