From: H.J. Lu <hjl.tools@gmail.com>
Date: Sun, 9 Dec 2012 18:01:39 +0000 (+0000)
Subject: Properly check indicies bigger than 4Gb
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=35f0d396520eae5171f1ca089f38ca78b8882300;p=binutils-gdb.git

Properly check indicies bigger than 4Gb

	PR binutils/14933
	* archive.c (bsd_write_armap): Properly check indicies bigger
	than 4Gb.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b8fb291935e..9b286cffe46 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/14933
+	* archive.c (bsd_write_armap): Properly check indicies bigger
+	than 4Gb.
+
 2012-12-07  Alan Modra  <amodra@gmail.com>
 
 	PR ld/14926
diff --git a/bfd/archive.c b/bfd/archive.c
index 8e8fd2de5ca..2fdc8b9ad93 100644
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -2424,9 +2424,6 @@ bsd_write_armap (bfd *arch,
   unsigned int count;
   struct ar_hdr hdr;
   long uid, gid;
-  file_ptr max_first_real = 1;
-
-  max_first_real <<= 31;
 
   firstreal = mapsize + elength + sizeof (struct ar_hdr) + SARMAG;
 
@@ -2469,6 +2466,7 @@ bsd_write_armap (bfd *arch,
 
   for (count = 0; count < orl_count; count++)
     {
+      unsigned int offset;
       bfd_byte buf[BSD_SYMDEF_SIZE];
 
       if (map[count].u.abfd != last_elt)
@@ -2488,7 +2486,8 @@ bsd_write_armap (bfd *arch,
       /* The archive file format only has 4 bytes to store the offset
 	 of the member.  Check to make sure that firstreal has not grown
 	 too big.  */
-      if (firstreal >= max_first_real)
+      offset = (unsigned int) firstreal;
+      if (firstreal != (file_ptr) offset)
 	{
 	  bfd_set_error (bfd_error_file_truncated);
 	  return FALSE;