From: Pedro Alves <palves@redhat.com>
Date: Mon, 26 Jun 2017 23:21:25 +0000 (+0100)
Subject: Fix GDB regressions caused by previous bfd_get_section_contents changes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ab27f80c5dceaa23c4ba7f62c0d5d22a5d5dd7a1;p=binutils-gdb.git

Fix GDB regressions caused by previous bfd_get_section_contents changes

Ref: https://sourceware.org/ml/binutils/2017-06/msg00343.html

bfd/ChangeLog:
2017-06-26  Pedro Alves  <palves@redhat.com>

	PR binutils/21665
	* libbfd.c (_bfd_generic_get_section_contents): Add "count", not
	"sz".
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fbe20499b96..c2491d52338 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-26  Pedro Alves  <palves@redhat.com>
+
+	PR binutils/21665
+	* libbfd.c (_bfd_generic_get_section_contents): Add "count", not
+	"sz".
+
 2017-06-26  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR binutils/21665
diff --git a/bfd/libbfd.c b/bfd/libbfd.c
index 7b270efeb75..b8c65b5e521 100644
--- a/bfd/libbfd.c
+++ b/bfd/libbfd.c
@@ -820,7 +820,7 @@ _bfd_generic_get_section_contents (bfd *abfd,
     }
   if (offset + count < count
       || offset + count > sz
-      || (section->filepos + offset + sz) > (bfd_size_type) filesz)
+      || (section->filepos + offset + count) > (bfd_size_type) filesz)
     {
       bfd_set_error (bfd_error_invalid_operation);
       return FALSE;