emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'master' into 'master'

Browse Source 
pmap: Fix detail parsing on long mapping lines

If the mapping descriptor is longer than 128 chars, the last parsed
character won't be a newline even if the current buffer contains it a
bit further than that. The current code always interprets it as a short
fgets() read instead, and thus keeps calling fgets() until it gets a
newline, dropping valid lines and failing with the following error:

pmap: ERROR: inconsistent detail field in smaps file, line:
 Rss:                 212 kB

See merge request !10
This commit is contained in:
Craig Small 2016-03-03 10:29:58 +00:00
commit 666b2946b2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pmap.c
View File

@ -314,17 +314,17 @@ static void print_extended_maps (FILE *f)
while (ret != NULL) { while (ret != NULL) {
/* === READ MAPPING === */ /* === READ MAPPING === */
map_desc[0] = '\0'; map_desc[0] = '\0';
c = '\n';
nfields = sscanf(mapbuf, nfields = sscanf(mapbuf,
"%"NUML"[0-9a-f]-%"NUML"[0-9a-f] " "%"NUML"[0-9a-f]-%"NUML"[0-9a-f] "
"%"DETL"s %"NUML"[0-9a-f] " "%"DETL"s %"NUML"[0-9a-f] "
"%63[0-9a-f:] %"NUML"s %127[^\n]%c", "%63[0-9a-f:] %"NUML"s %127[^\n]",
start, end, perms, offset, start, end, perms, offset,
dev, inode, map_desc, &c); dev, inode, map_desc);
/* Must read at least up to inode, else something has changed! */ /* Must read at least up to inode, else something has changed! */
if (nfields < 6) if (nfields < 6)
xerrx(EXIT_FAILURE, _("Unknown format in smaps file!")); xerrx(EXIT_FAILURE, _("Unknown format in smaps file!"));
/* If line too long we dump everything else. */ /* If line too long we dump everything else. */
c = mapbuf[strlen(mapbuf) - 1];
while (c != '\n') { while (c != '\n') {
ret = fgets(mapbuf, sizeof mapbuf, f); ret = fgets(mapbuf, sizeof mapbuf, f);
c = mapbuf[strlen(mapbuf) - 1]; c = mapbuf[strlen(mapbuf) - 1];