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

0093-pmap: Remove dead code in mapping_name().

Browse Source 
If "cp = strrchr(mapbuf_b, '/')" then this function returns, and
otherwise there is no '/' in mapbuf_b and "cp = strchr(mapbuf_b, '/')"
is always false: remove this second block, since it is never entered.
Also, constify a few things in this function.

Signed-off-by: Craig Small <csmall@enc.com.au>
This commit is contained in:
Qualys Security Advisory 1970-01-01 00:00:00 +00:00 committed by Craig Small
parent 991b41cb32
commit 7d3b4bcaf2
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pmap.c
View File

@ -212,12 +212,12 @@ out_destroy:
return; return;
} }
static char *mapping_name(struct pids_stack *p, unsigned long addr, static const char *mapping_name(struct pids_stack *p, unsigned long addr,
unsigned long len, const char *mapbuf_b, unsigned long len, const char *mapbuf_b,
unsigned showpath, unsigned dev_major, unsigned showpath, unsigned dev_major,
unsigned dev_minor, unsigned long long inode) unsigned dev_minor, unsigned long long inode)
{ {
char *cp; const char *cp;
if (!dev_major && dev_minor == shm_minor && strstr(mapbuf_b, "/SYSV")) { if (!dev_major && dev_minor == shm_minor && strstr(mapbuf_b, "/SYSV")) {
static char shmbuf[64]; static char shmbuf[64];
@ -232,14 +232,6 @@ static char *mapping_name(struct pids_stack *p, unsigned long addr,
return cp[1] ? cp + 1 : cp; return cp[1] ? cp + 1 : cp;
} }
cp = strchr(mapbuf_b, '/');
if (cp) {
if (showpath)
return cp;
/* it WILL succeed */
return strrchr(cp, '/') + 1;
}
cp = _(" [ anon ]"); cp = _(" [ anon ]");
if (PIDS_VAL(start_stack, ul_int, p, Pids_info) >= addr if (PIDS_VAL(start_stack, ul_int, p, Pids_info) >= addr
&& (PIDS_VAL(start_stack, ul_int, p, Pids_info) <= addr + len)) && (PIDS_VAL(start_stack, ul_int, p, Pids_info) <= addr + len))