PR29362, some binutils memory leaks

2022-08-16  Alan Modra  <amodra@gmail.com>
	    Cunlong Li  <shenxiaogll@163.com>

	PR 29362
	* dwarf.c (free_debug_information): New function, extracted..
	(free_debug_memory): ..from here.
	(process_debug_info): Use it when before clearing out unit
	debug_information.  Clear all fields.
	* objcopy.c (delete_symbol_htabs): New function.
	(main): Call it via xatexit.
	(copy_archive): Free "dir".
	* objdump.c (free_debug_section): Free reloc_info.

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 09220978380230860f48c9a64c8457f42869dc63..71d8bc9ed5c86cce851a2726ae672c63215b8135 100644 (file)
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -3509,6 +3509,21 @@ introduce (struct dwarf_section * section, bool raw)
     }
 }
 
+/* Free memory allocated for one unit in debug_information.  */
+
+static void
+free_debug_information (debug_info *ent)
+{
+  if (ent->max_loc_offsets)
+    {
+      free (ent->loc_offsets);
+      free (ent->loc_views);
+      free (ent->have_frame_base);
+    }
+  if (ent->max_range_lists)
+    free (ent->range_lists);
+}
+
 /* Process the contents of a .debug_info section.
    If do_loc is TRUE then we are scanning for location lists and dwo tags
    and we do not want to display anything to the user.
@@ -3805,25 +3820,14 @@ process_debug_info (struct dwarf_section * section,
          && alloc_num_debug_info_entries > unit
          && ! do_types)
        {
-         debug_information [unit].cu_offset = cu_offset;
-         debug_information [unit].pointer_size
-           = compunit.cu_pointer_size;
-         debug_information [unit].offset_size = offset_size;
-         debug_information [unit].dwarf_version = compunit.cu_version;
-         debug_information [unit].base_address = 0;
-         debug_information [unit].addr_base = DEBUG_INFO_UNAVAILABLE;
-         debug_information [unit].ranges_base = DEBUG_INFO_UNAVAILABLE;
-         debug_information [unit].rnglists_base = 0;
-         debug_information [unit].loc_offsets = NULL;
-         debug_information [unit].have_frame_base = NULL;
-         debug_information [unit].max_loc_offsets = 0;
-         debug_information [unit].num_loc_offsets = 0;
-         debug_information [unit].loclists_base = 0;
-         debug_information [unit].range_lists = NULL;
-         debug_information [unit].max_range_lists= 0;
-         debug_information [unit].num_range_lists = 0;
-         debug_information [unit].rnglists_base = 0;
-         debug_information [unit].str_offsets_base = 0;
+         free_debug_information (&debug_information[unit]);
+         memset (&debug_information[unit], 0, sizeof (*debug_information));
+         debug_information[unit].pointer_size = compunit.cu_pointer_size;
+         debug_information[unit].offset_size = offset_size;
+         debug_information[unit].dwarf_version = compunit.cu_version;
+         debug_information[unit].cu_offset = cu_offset;
+         debug_information[unit].addr_base = DEBUG_INFO_UNAVAILABLE;
+         debug_information[unit].ranges_base = DEBUG_INFO_UNAVAILABLE;
        }
 
       if (!do_loc && dwarf_start_die == 0)
@@ -12021,15 +12025,7 @@ free_debug_memory (void)
   if (debug_information != NULL)
     {
       for (i = 0; i < alloc_num_debug_info_entries; i++)
-       {
-         if (debug_information [i].max_loc_offsets)
-           {
-             free (debug_information [i].loc_offsets);
-             free (debug_information [i].have_frame_base);
-           }
-         if (debug_information [i].max_range_lists)
-           free (debug_information [i].range_lists);
-       }
+       free_debug_information (&debug_information[i]);
       free (debug_information);
       debug_information = NULL;
       alloc_num_debug_info_entries = num_debug_info_entries = 0;

diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index b907b02d5e7483dcf7915e02f930cfc468a47d9c..1118a2256a4fe49e2a261a8fdd5143d15b75fa8e 100644 (file)
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -1048,6 +1048,20 @@ create_symbol_htabs (void)
   redefine_specific_reverse_htab = create_symbol_htab ();
 }
 
+static void
+delete_symbol_htabs (void)
+{
+  htab_delete (strip_specific_htab);
+  htab_delete (strip_unneeded_htab);
+  htab_delete (keep_specific_htab);
+  htab_delete (localize_specific_htab);
+  htab_delete (globalize_specific_htab);
+  htab_delete (keepglobal_specific_htab);
+  htab_delete (weaken_specific_htab);
+  htab_delete (redefine_specific_htab);
+  htab_delete (redefine_specific_reverse_htab);
+}
+
 /* Add a symbol to strip_specific_list.  */
 
 static void
@@ -3736,6 +3750,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
   }
 
   rmdir (dir);
+  free (dir);
 }
 
 static void
@@ -6016,6 +6031,7 @@ main (int argc, char *argv[])
     }
 
   create_symbol_htabs ();
+  xatexit (delete_symbol_htabs);
 
   if (argv != NULL)
     bfd_set_error_program_name (argv[0]);

diff --git a/binutils/objdump.c b/binutils/objdump.c
index 188c286e294fa7491cd7bb9dc0a77017659e0ac6..b34df5392b96ab1f663225751a24ab7f3309a07c 100644 (file)
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -4108,6 +4108,9 @@ free_debug_section (enum dwarf_section_display_enum debug)
   section->start = NULL;
   section->address = 0;
   section->size = 0;
+  free ((char*) section->reloc_info);
+  section->reloc_info = NULL;
+  section->num_relocs= 0;
 }
 
 void