Import parch from mainline to prevent buffer overrun.

	PR 21995
	* readelf.c (process_mips_specific): Add checks for a NULL data
	pointer.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 7c9b86f950b197cf1f1c3bdc3dce28d5f08ea30c..f74a4367b8be1d9dda12a3721600badaccdf8fbd 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,11 @@
+2017-09-05  Nick Clifton  <nickc@redhat.com>
+
+       Import from mainline:
+
+       PR 21995
+       * readelf.c (process_mips_specific): Add checks for a NULL data
+       pointer.
+
 2017-08-12  Alan Modra  <amodra@gmail.com>
 
        * readelf.c (process_note): Qualify NT_GNU_BUILD_ATTRIBUTE notes

diff --git a/binutils/readelf.c b/binutils/readelf.c
index 9bbfc957e4d127f2813c7619af4b0cac1e80fad7..934966219710dfd1840ba045da5dc9c9066f8a3a 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -15296,7 +15296,7 @@ process_mips_specific (FILE * file)
              printf ("\n");
            }
 
-         if (ent < end)
+         if (data != NULL && ent < end)
            {
              printf (_(" Local entries:\n"));
              printf ("  %*s %10s %*s\n",
@@ -15826,7 +15826,7 @@ process_mips_specific (FILE * file)
        }
       printf ("\n");
 
-      if (ent < local_end)
+      if (data != NULL && ent < local_end)
        {
          printf (_(" Local entries:\n"));
          printf ("  %*s %10s %*s\n",
@@ -15842,7 +15842,7 @@ process_mips_specific (FILE * file)
          printf ("\n");
        }
 
-      if (gotsym < symtabno)
+      if (data != NULL && gotsym < symtabno)
        {
          int sym_width;