Fix attempt to free non-allocated pointer when parsing .debug_sup sections.

	PR 27796
	* dwarf.c (load_debug_sup_file): Allocate memory for filename in
	.debug_sup section.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 67fff0b195d0a244cee5d68f905bb21104f5863b..5d87b196346f7800744772179f29d1b8e3058fa9 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2021-04-30  Nick Clifton  <nickc@redhat.com>
+
+       PR 27796
+       * dwarf.c (load_debug_sup_file): Allocate memory for filename in
+       .debug_sup section.
+
 2021-04-29  Nick Clifton  <nickc@redhat.com>
 
        PR 27594

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index e1f76102056680b5518838dd837775585b2da1b0..adb5c130ccd182b9a667a603bb21457611fd595b 100644 (file)
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -11327,6 +11327,7 @@ load_dwo_file (const char * main_filename, const char * name, const char * dir,
   /* FIXME: We should check the dwo_id.  */
 
   printf (_("%s: Found separate debug object file: %s\n\n"), main_filename, separate_filename);
+
   add_separate_debug_file (separate_filename, separate_handle);
   /* Note - separate_filename will be freed in free_debug_memory().  */
   return separate_handle;
@@ -11361,20 +11362,38 @@ load_debug_sup_file (const char * main_filename, void * file)
   if (filename[0] != '/' && strchr (main_filename, '/'))
     {
       char * new_name;
-      if (asprintf (& new_name, "%.*s/%s",
-                   (int) (strrchr (main_filename, '/') - main_filename),
-                   main_filename,
-                   filename) < 3)
-       warn (_("unable to construct path for supplementary debug file"));
-      else
-       filename = new_name;
+      int new_len;
+
+      new_len = asprintf (& new_name, "%.*s/%s",
+                         (int) (strrchr (main_filename, '/') - main_filename),
+                         main_filename,
+                         filename);
+      if (new_len < 3)
+       {
+         warn (_("unable to construct path for supplementary debug file"));
+         if (new_len > -1)
+           free (new_name);
+         return;
+       }
+      filename = new_name;
+    }
+  else
+    {
+      /* PR 27796: Make sure that we pass a filename that can be free'd to
+        add_separate_debug_file().  */
+      filename = strdup (filename);
+      if (filename == NULL)
+       {
+         warn (_("out of memory constructing filename for .debug_sup link\n"));
+         return;
+       }
     }
 
-  void * handle;
-  handle = open_debug_file (filename);
+  void * handle = open_debug_file (filename);
   if (handle == NULL)
     {
       warn (_("unable to open file '%s' referenced from .debug_sup section\n"), filename);
+      free ((void *) filename);
       return;
     }