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.
This commit is contained in:
Michael Snyder 2005-05-23 21:19:48 +00:00
parent 6c932e5455
commit 2e14c2ea7f
2 changed files with 8 additions and 6 deletions

View file

@ -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

View file

@ -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);
}