Fix a heap use after free memory access fault when displaying error messages about...

	PR 14049
	* readelf.c (process_archive): Use arch.file_name in error
	messages until the qualified name is available.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index a0fadddfad09d6b910672625a3a4379c6f20864d..1f17d8f495cac617429434d891fd932cfa5ddbc3 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2019-01-09  Nick Clifton  <nickc@redhat.com>
+
+       PR 14049
+       * readelf.c (process_archive): Use arch.file_name in error
+       messages until the qualified name is available.
+
 2019-01-09  Andrew Paprocki  <andrew@ishiboo.com>
 
        * configure: Regenerate.

diff --git a/binutils/readelf.c b/binutils/readelf.c
index 44577d8896fb13aeafb35dafd421a2c50990f18f..56b80ccc9fbe91ae98cbc7e20a60f3d9b3af866a 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -19398,7 +19398,7 @@ process_archive (Filedata * filedata, bfd_boolean is_thin_archive)
       /* Read the next archive header.  */
       if (fseek (filedata->handle, arch.next_arhdr_offset, SEEK_SET) != 0)
         {
-          error (_("%s: failed to seek to next archive header\n"), filedata->file_name);
+          error (_("%s: failed to seek to next archive header\n"), arch.file_name);
           return FALSE;
         }
       got = fread (&arch.arhdr, 1, sizeof arch.arhdr, filedata->handle);
@@ -19406,7 +19406,10 @@ process_archive (Filedata * filedata, bfd_boolean is_thin_archive)
         {
           if (got == 0)
            break;
-          error (_("%s: failed to read archive header\n"), filedata->file_name);
+         /* PR 24049 - we cannot use filedata->file_name as this will
+            have already been freed.  */
+         error (_("%s: failed to read archive header\n"), arch.file_name);
+           
           ret = FALSE;
           break;
         }
@@ -19426,7 +19429,7 @@ process_archive (Filedata * filedata, bfd_boolean is_thin_archive)
       name = get_archive_member_name (&arch, &nested_arch);
       if (name == NULL)
        {
-         error (_("%s: bad archive file name\n"), filedata->file_name);
+         error (_("%s: bad archive file name\n"), arch.file_name);
          ret = FALSE;
          break;
        }
@@ -19435,7 +19438,7 @@ process_archive (Filedata * filedata, bfd_boolean is_thin_archive)
       qualified_name = make_qualified_name (&arch, &nested_arch, name);
       if (qualified_name == NULL)
        {
-         error (_("%s: bad archive file name\n"), filedata->file_name);
+         error (_("%s: bad archive file name\n"), arch.file_name);
          ret = FALSE;
          break;
        }
@@ -19481,7 +19484,7 @@ process_archive (Filedata * filedata, bfd_boolean is_thin_archive)
          if (nested_arch.file == NULL)
            {
              error (_("%s: contains corrupt thin archive: %s\n"),
-                    filedata->file_name, name);
+                    qualified_name, name);
              ret = FALSE;
              break;
            }