--- binutils.orig/binutils/readelf.c	2020-07-24 14:55:25.163647522 +0100

+++ binutils-2.35/binutils/readelf.c	2020-07-24 15:02:39.613851369 +0100

@@ -20729,79 +20729,92 @@ process_file (char * file_name)

   Filedata * filedata = NULL;

   struct stat statbuf;

   char armag[SARMAG];

-  bfd_boolean ret = TRUE;

+  bfd_boolean ret = FALSE;

+  char * name;

+  char * saved_program_name;

+

+  /* Overload program_name to include file_name.  Doing this means

+     that warning/error messages will positively identify the file

+     concerned even when multiple instances of readelf are running.  */

+  name = xmalloc (strlen (program_name) + strlen (file_name) + 3);

+  sprintf (name, "%s: %s", program_name, file_name);

+  saved_program_name = program_name;

+  program_name = name;

   if (stat (file_name, &statbuf) < 0)

     {

       if (errno == ENOENT)

-	error (_("'%s': No such file\n"), file_name);

+	error (_("No such file\n"));

       else

-	error (_("Could not locate '%s'.  System error message: %s\n"),

-	       file_name, strerror (errno));

-      return FALSE;

+	error (_("Could not locate file.  System error message: %s\n"),

+	       strerror (errno));

+      goto done;

     }

   if (! S_ISREG (statbuf.st_mode))

     {

-      error (_("'%s' is not an ordinary file\n"), file_name);

-      return FALSE;

+      error (_("Not an ordinary file\n"));

+      goto done;

     }

   filedata = calloc (1, sizeof * filedata);

   if (filedata == NULL)

     {

       error (_("Out of memory allocating file data structure\n"));

-      return FALSE;

+      goto done;

     }

   filedata->file_name = file_name;

   filedata->handle = fopen (file_name, "rb");

   if (filedata->handle == NULL)

     {

-      error (_("Input file '%s' is not readable.\n"), file_name);

-      free (filedata);

-      return FALSE;

+      error (_("Not readable\n"));

+      goto done;

     }

   if (fread (armag, SARMAG, 1, filedata->handle) != 1)

     {

-      error (_("%s: Failed to read file's magic number\n"), file_name);

+      error (_("Failed to read file's magic number\n"));

       fclose (filedata->handle);

-      free (filedata);

-      return FALSE;

+      goto done;

     }

   filedata->file_size = (bfd_size_type) statbuf.st_size;

   if (memcmp (armag, ARMAG, SARMAG) == 0)

     {

-      if (! process_archive (filedata, FALSE))

-	ret = FALSE;

+      if (process_archive (filedata, FALSE))

+	ret = TRUE;

     }

   else if (memcmp (armag, ARMAGT, SARMAG) == 0)

     {

-      if ( ! process_archive (filedata, TRUE))

-	ret = FALSE;

+      if (process_archive (filedata, TRUE))

+	ret = TRUE;

     }

   else

     {

       if (do_archive_index && !check_all)

-	error (_("File %s is not an archive so its index cannot be displayed.\n"),

-	       file_name);

+	error (_("Not an archive so its index cannot be displayed.\n"));

       rewind (filedata->handle);

       filedata->archive_file_size = filedata->archive_file_offset = 0;

-      if (! process_object (filedata))

-	ret = FALSE;

+      if (process_object (filedata))

+	ret = TRUE;

     }

-  fclose (filedata->handle);

-  free (filedata->section_headers);

-  free (filedata->program_headers);

-  free (filedata->string_table);

-  free (filedata->dump.dump_sects);

-  free (filedata);

+ done:

+  if (filedata)

+    {

+      fclose (filedata->handle);

+      free (filedata->section_headers);

+      free (filedata->program_headers);

+      free (filedata->string_table);

+      free (filedata->dump.dump_sects);

+      free (filedata);

+    }

+  free (program_name);

+  program_name = saved_program_name;

   free (ba_cache.strtab);

   ba_cache.strtab = NULL;

--- binutils.orig/binutils/readelf.c	2021-01-07 12:59:35.802994842 +0000

+++ binutils-2.35.1/binutils/readelf.c	2021-01-07 13:02:36.591754005 +0000

@@ -20818,7 +20818,8 @@ process_file (char * file_name)

  done:

   if (filedata)

     {

-      fclose (filedata->handle);

+      if (filedata->handle != NULL)

+	fclose (filedata->handle);

       free (filedata->section_headers);

       free (filedata->program_headers);

       free (filedata->string_table);

--- binutils.orig/binutils/readelf.c	2021-01-08 17:01:23.573093204 +0000

+++ binutils-2.35.1/binutils/readelf.c	2021-01-08 17:02:23.095677242 +0000

@@ -20787,7 +20787,6 @@ process_file (char * file_name)

   if (fread (armag, SARMAG, 1, filedata->handle) != 1)

     {

       error (_("Failed to read file's magic number\n"));

-      fclose (filedata->handle);

       goto done;

     }