From eeeb57f8ed5fc5c9f8e44d150d8bd9a2a9129c0d Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Fri, 8 Jan 2021 17:48:06 +0000
Subject: [PATCH] Fix bug running readelf on an empty file.  (#1903448)

---
 binutils-2.29-filename-in-error-messages.patch | 10 ++++++++++
 binutils.spec                                  |  8 +++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/binutils-2.29-filename-in-error-messages.patch b/binutils-2.29-filename-in-error-messages.patch
index f75d995..1aa3737 100644
--- a/binutils-2.29-filename-in-error-messages.patch
+++ b/binutils-2.29-filename-in-error-messages.patch
@@ -133,3 +133,13 @@
        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;
+     }
+ 
diff --git a/binutils.spec b/binutils.spec
index 779242d..5ddd2d1 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -39,7 +39,7 @@
 Summary: A GNU collection of binary utilities
 Name: binutils%{?name_cross}%{?_with_debug:-debug}
 Version: 2.35.1
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/binutils
 
@@ -874,6 +874,12 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Fri Jan 08 2021 Nick Clifton  <nickc@redhat.com> - 2.35.1-20
+- Fix bug running readelf on an empty file.  (#1903448)
+
+* Thu Jan 07 2021 Nick Clifton  <nickc@redhat.com> - 2.35.1-19
+- Fix bug running readelf on a file that cannot be read.  (#1913589)
+
 * Mon Jan 04 2021 Nick Clifton  <nickc@redhat.com> - 2.35.1-18
 - Fix linking with multiple same-name sections.  (PR 27100)