2005-05-23 Michael Snyder <msnyder@redhat.com>

        From Nora Pan <qpan@mvista.com>
        * linux-nat.c (read_mapping): Don't stumble over entries in
        mapping that have name but zero inode.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f68f9a8194884184b1c59765ad72d2b52b6998b5..7330f54caad68509382019d503ba155fbb779803 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-23  Michael Snyder  <msnyder@redhat.com>
+       From Nora Pan <qpan@mvista.com>
+       * linux-nat.c (read_mapping): Don't stumble over entries in
+       mapping that have name but zero inode.
+
 2005-05-23  Andrew Cagney  <cagney@gnu.org>
 
        * target.h (child_xfer_memory): Use gdb_byte for byte buffer

diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index b39d7926efb77cf8c3313aaa86e078572211a246..2c64d5db9f818860c4f4c33ec58e164f6706ad5c 100644 (file)
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -2451,7 +2451,8 @@ read_mapping (FILE *mapfile,
   int ret = fscanf (mapfile, "%llx-%llx %s %llx %s %llx",
                    addr, endaddr, permissions, offset, device, inode);
 
-  if (ret > 0 && ret != EOF && *inode != 0)
+  filename[0] = '\0';
+  if (ret > 0 && ret != EOF)
     {
       /* Eat everything up to EOL for the filename.  This will prevent
          weird filenames (such as one with embedded whitespace) from
@@ -2462,11 +2463,7 @@ read_mapping (FILE *mapfile,
          only.  */
       ret += fscanf (mapfile, "%[^\n]\n", filename);
     }
-  else
-    {
-      filename[0] = '\0';      /* no filename */
-      fscanf (mapfile, "\n");
-    }
+
   return (ret != 0 && ret != EOF);
 }