glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

umovestr result may have no NUL, use "%.*s" instead of "%s" to print it

Browse Source 
* system.c (sys_mount): Be careful when printing umovestr result,
it may have no terminating NUL.
(sys_sysmips): Likewise.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2012-01-20 11:52:12 +01:00
parent a1d541ec56
commit a17e55ca8f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
system.c
View File

@ -513,7 +513,7 @@ sys_mount(struct tcb *tcp)
tcp->u_arg[0], sizeof type, type) < 0) {
tprintf("OLDTYPE:#%lx", tcp->u_arg[0]);
} else {
tprintf("\"%s\", ", type);
tprintf("\"%.4s\", ", type);
}
printstr(tcp, tcp->u_arg[1], -1);
tprints(", ");
@ -1437,11 +1437,11 @@ sys_mount(struct tcb *tcp)
for all SVR4's? */
if (tcp->u_arg[2] & (MS_FSS | MS_DATA)) {
if (umovestr(tcp, tcp->u_arg[3], FSTYPSZ, fstyp) < 0) {
*fstyp = 0;
fstyp[0] = '\0';
tprintf(", %ld", tcp->u_arg[3]);
}
else
tprintf(", \"%s\"", fstyp);
tprintf(", \"%.*s\"", (int)FSTYPSZ, fstyp);
}
if (tcp->u_arg[2] & MS_DATA) {
tprints(", ");
@ -2317,7 +2317,7 @@ int sys_sysmips(struct tcb *tcp)
if (umovestr(tcp, tcp->u_arg[1], (__NEW_UTS_LEN + 1), nodename) < 0)
tprintf(", %#lx", tcp->u_arg[1]);
else
tprintf(", \"%s\"", nodename);
tprintf(", \"%.*s\"", (int)(__NEW_UTS_LEN + 1), nodename);
} else if (tcp->u_arg[0] == MIPS_ATOMIC_SET) {
tprintf(", %#lx, 0x%lx", tcp->u_arg[1], tcp->u_arg[2]);
} else if (tcp->u_arg[0] == MIPS_FIXADE) {