svn commit: r300669 - head/usr.sbin/pmcstat
Ed Schouten
ed at FreeBSD.org
Wed May 25 08:45:04 UTC 2016
Author: ed
Date: Wed May 25 08:45:03 2016
New Revision: 300669
URL: https://svnweb.freebsd.org/changeset/base/300669
Log:
Make code compile when basename() is POSIX compliant.
The POSIX basename() function is allowed to modify its input buffer,
which means its argument is "char *". Pull a copy of the input string
before computing the base.
Reviewed by: jtl
Differential Revision: https://reviews.freebsd.org/D6465
Modified:
head/usr.sbin/pmcstat/pmcpl_gprof.c
Modified: head/usr.sbin/pmcstat/pmcpl_gprof.c
==============================================================================
--- head/usr.sbin/pmcstat/pmcpl_gprof.c Wed May 25 08:09:14 2016 (r300668)
+++ head/usr.sbin/pmcstat/pmcpl_gprof.c Wed May 25 08:45:03 2016 (r300669)
@@ -310,8 +310,9 @@ pmcstat_callgraph_do_gmon_arcs(void)
void
pmcpl_gmon_initimage(struct pmcstat_image *pi)
{
+ const char *execpath;
int count, nlen;
- char *sn;
+ char *sn, *snbuf;
char name[NAME_MAX];
/*
@@ -321,9 +322,11 @@ pmcpl_gmon_initimage(struct pmcstat_imag
* `basename(path)`+ "~" + NNN + ".gmon" till we get a free
* entry.
*/
- if ((sn = basename(pmcstat_string_unintern(pi->pi_execpath))) == NULL)
- err(EX_OSERR, "ERROR: Cannot process \"%s\"",
- pmcstat_string_unintern(pi->pi_execpath));
+ execpath = pmcstat_string_unintern(pi->pi_execpath);
+ if ((snbuf = strdup(execpath)) == NULL)
+ err(EX_OSERR, "ERROR: Cannot copy \"%s\"", execpath);
+ if ((sn = basename(snbuf)) == NULL)
+ err(EX_OSERR, "ERROR: Cannot process \"%s\"", execpath);
nlen = strlen(sn);
nlen = min(nlen, (int) (sizeof(name) - sizeof(".gmon")));
@@ -355,6 +358,7 @@ pmcpl_gmon_initimage(struct pmcstat_imag
}
} while (count > 0);
}
+ free(snbuf);
LIST_INIT(&pi->pi_gmlist);
}
More information about the svn-src-head
mailing list