nm: Avoid potential segmentation fault when displaying symbols without version info.

PR 32467

diff --git a/binutils/nm.c b/binutils/nm.c
index faf27c59b4d31585d81379ea8b052ff26459543e..0ba7604d34ffb7c085acf31663df2e1d0675834f 100644 (file)
--- a/binutils/nm.c
+++ b/binutils/nm.c
@@ -682,7 +682,7 @@ print_symname (const char *form, struct extended_symbol_info *info,
               const char *name, bfd *abfd)
 {
   char *alloc = NULL;
-  char *atver = NULL;
+  char *atname = NULL;
 
   if (name == NULL)
     name = info->sinfo->name;
@@ -690,9 +690,19 @@ print_symname (const char *form, struct extended_symbol_info *info,
   if (!with_symbol_versions
       && bfd_get_flavour (abfd) == bfd_target_elf_flavour)
     {
-      atver = strchr (name, '@');
+      char *atver = strchr (name, '@');
+
       if (atver)
-       *atver = 0;
+       {
+         /* PR 32467 - Corrupt binaries might include an @ character in a
+            symbol name.  Since non-versioned symbol names can be in
+            read-only memory (via memory mapping of a file's contents) we
+            cannot just replace the @ character with a NUL.  Instead we
+            create a truncated copy of the name.  */
+         atname = xstrdup (name);
+         atname [atver - name] = 0;
+         name = atname;
+       }
     }
 
   if (do_demangle && *name)
@@ -703,9 +713,7 @@ print_symname (const char *form, struct extended_symbol_info *info,
     }
 
   if (unicode_display != unicode_default)
-    {
-      name = convert_utf8 (name);
-    }
+    name = convert_utf8 (name);
 
   if (info != NULL && info->elfinfo && with_symbol_versions)
     {
@@ -726,8 +734,8 @@ print_symname (const char *form, struct extended_symbol_info *info,
        }
     }
   printf (form, name);
-  if (atver)
-    *atver = '@';
+
+  free (atname);
   free (alloc);
 }