matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2016-12-02 14:19:08 -08:00
parent d57639a475 1dd0cca7fa
commit f2df31170f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc/ss.c
View File

@ -3008,10 +3008,12 @@ static int unix_show_sock(const struct sockaddr_nl *addr, struct nlmsghdr *nlh,
memcpy(name, RTA_DATA(tb[UNIX_DIAG_NAME]), len); memcpy(name, RTA_DATA(tb[UNIX_DIAG_NAME]), len);
name[len] = '\0'; name[len] = '\0';
if (name[0] == '\0') if (name[0] == '\0') {
for (int i = 0; i < len; i++) int i;
for (i = 0; i < len; i++)
if (name[i] == '\0') if (name[i] == '\0')
name[i] = '@'; name[i] = '@';
}
stat.name = &name[0]; stat.name = &name[0];
memcpy(stat.local.data, &stat.name, sizeof(stat.name)); memcpy(stat.local.data, &stat.name, sizeof(stat.name));
} }