Correct buffer overrun test

	* peXXigen.c (pe_print_idata): Revert last patch, cast lhs instead.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index dfa8c1934775154b9b9b01e8de929a5094ac818c..23c8419b5c0d652b94d5eec5e2ef1186dce58623 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-08  Alan Modra  <amodra@gmail.com>
+
+       * peXXigen.c (pe_print_idata): Revert last patch, cast lhs instead.
+
 2014-11-07  H.J. Lu  <hongjiu.lu@intel.com>
 
        * peXXigen.c (pe_print_idata): Cast to unsigned long in range

diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c
index 2b63e2a4db6288d7e198019d4a20d72e950fbf32..ea1459bdef5cfb4b69988699c406ba9319f35972 100644 (file)
--- a/bfd/peXXigen.c
+++ b/bfd/peXXigen.c
@@ -1467,7 +1467,7 @@ pe_print_idata (bfd * abfd, void * vfile)
                         member_high, member,
                         WithoutHighBit (member_high), member);
              /* PR binutils/17512: Handle corrupt PE data.  */
-             else if (member - adj + 2 >= (unsigned long) datasize)
+             else if ((bfd_vma) member - adj + 2 >= datasize)
                fprintf (file, _("\t<corrupt: 0x%04lx>"), member);
              else
                {
@@ -1502,7 +1502,7 @@ pe_print_idata (bfd * abfd, void * vfile)
                fprintf (file, "\t%04lx\t %4lu  <none>",
                         member, WithoutHighBit (member));
              /* PR binutils/17512: Handle corrupt PE data.  */
-             else if (member - adj + 2 >= (unsigned long) datasize)
+             else if ((bfd_vma) member - adj + 2 >= datasize)
                fprintf (file, _("\t<corrupt: 0x%04lx>"), member);
              else
                {