Fix memory leak in RiscV assembler.

[binutils-gdb.git] / gas / output-file.c

diff --git a/gas/output-file.c b/gas/output-file.c
index 94dbc2e8c01b0549d1d548ac091b5c832ca2623d..664bc88e9c1ffcb88a4f196df16d39617c7615db 100644 (file)
--- a/gas/output-file.c
+++ b/gas/output-file.c
@@ -1,5 +1,5 @@
 /* output-file.c -  Deal with the output file
-   Copyright (C) 1987-2015 Free Software Foundation, Inc.
+   Copyright (C) 1987-2023 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -19,6 +19,9 @@
    02110-1301, USA.  */
 
 #include "as.h"
+#include "subsegs.h"
+#include "sb.h"
+#include "macro.h"
 #include "output-file.h"
 
 #ifndef TARGET_MACH
@@ -28,7 +31,7 @@
 bfd *stdoutput;
 
 void
-output_file_create (char *name)
+output_file_create (const char *name)
 {
   if (name[0] == '-' && name[1] == '\0')
     as_fatal (_("can't open a bfd on stdout %s"), name);
@@ -49,25 +52,73 @@ output_file_create (char *name)
     stdoutput->flags |= BFD_TRADITIONAL_FORMAT;
 }
 
+static void
+stash_frchain_obs (asection *sec)
+{
+  segment_info_type *info = seg_info (sec);
+  if (info)
+    {
+      struct frchain *frchp;
+      for (frchp = info->frchainP; frchp; frchp = frchp->frch_next)
+       obstack_ptr_grow (&notes, &frchp->frch_obstack);
+      info->frchainP = NULL;
+    }
+}
+
 void
-output_file_close (char *filename)
+output_file_close (void)
 {
-  bfd_boolean res;
+  bool res;
+  bfd *obfd = stdoutput;
+  struct obstack **obs;
+  asection *sec;
+  const char *filename;
 
-  if (stdoutput == NULL)
+  if (obfd == NULL)
     return;
 
-  /* Close the bfd.  */
-  if (had_errors ())
-    res = bfd_cache_close_all ();
-  else
-    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 ()));
+  /* We can't free obstacks attached to the output bfd sections before
+     closing the output bfd since data in those obstacks may need to
+     be accessed, but we can't access anything in the output bfd after
+     it is closed..  */
+  for (sec = obfd->sections; sec; sec = sec->next)
+    stash_frchain_obs (sec);
+  stash_frchain_obs (reg_section);
+  stash_frchain_obs (expr_section);
+  stash_frchain_obs (bfd_abs_section_ptr);
+  stash_frchain_obs (bfd_und_section_ptr);
+  obstack_ptr_grow (&notes, NULL);
+  obs = obstack_finish (&notes);
+
+  /* Close the bfd.  */
+  if (!flag_always_generate_output && had_errors ())
+    res = bfd_close_all_done (obfd);
+  else
+    res = bfd_close (obfd);
+  now_seg = NULL;
+  now_subseg = 0;
+
+  filename = out_file_name;
+  out_file_name = NULL;
+  if (!keep_it && filename)
+    unlink_if_ordinary (filename);
+
+#ifdef md_end
+  md_end ();
+#endif
+#ifdef obj_end
+  obj_end ();
+#endif
+  macro_end ();
+  expr_end ();
+  read_end ();
+  symbol_end ();
+  subsegs_end (obs);
+
+  if (!res)
+    as_fatal ("%s: %s", filename, bfd_errmsg (bfd_get_error ()));
 }