* output-file.c (output_file_close): Prevent an infinite loop reporting that stdoutpu...

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6e72db5247dc8abf89aaf1244a8d727003876b9c..4d49d9b89ceb06ca7da8bc9c834046a3d5d224cb 100644 (file)
--- 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 dfbef1f24d3648a2e2b9f8a1a29ed15af36b323b..9603dc4f38a0ccc30987b2e32a26a3fc8dc72597 100644 (file)
--- 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!  */
 }