2007-10-01 Dmitry V. Levin <ldv@altlinux.org>
* net.c (printsock): Output AF_UNIX socket address using
printpathn() to avoid unprintable characters in output.
Suggested by Neil Campbell.
diff --git a/net.c b/net.c
index 0085acb..9fff3e6 100644
--- a/net.c
+++ b/net.c
@@ -937,10 +937,7 @@
void
-printsock(tcp, addr, addrlen)
-struct tcb *tcp;
-long addr;
-int addrlen;
+printsock(struct tcb *tcp, long addr, int addrlen)
{
union {
char pad[128];
@@ -970,13 +967,16 @@
tprintf("%#lx", addr);
return;
}
- if ((addrlen<2) || (addrlen>sizeof(addrbuf)))
- addrlen=sizeof(addrbuf);
- if (umoven(tcp, addr, addrlen, (char*)&addrbuf) < 0) {
+ if (addrlen < 2 || addrlen > sizeof(addrbuf))
+ addrlen = sizeof(addrbuf);
+
+ memset(&addrbuf, 0, sizeof(addrbuf));
+ if (umoven(tcp, addr, addrlen, addrbuf.pad) < 0) {
tprintf("{...}");
return;
}
+ addrbuf.pad[sizeof(addrbuf.pad) - 1] = '\0';
tprintf("{sa_family=");
printxval(addrfams, addrbuf.sa.sa_family, "AF_???");
@@ -984,12 +984,14 @@
switch (addrbuf.sa.sa_family) {
case AF_UNIX:
- if (addrlen==2) {
- tprintf("<nil>");
+ if (addrlen == 2) {
+ tprintf("NULL");
} else if (addrbuf.sau.sun_path[0]) {
- tprintf("path=\"%-.*s\"", addrlen-2, addrbuf.sau.sun_path);
+ tprintf("path=");
+ printstr(tcp, addr + 2, strlen(addrbuf.sau.sun_path));
} else {
- tprintf("path=@%-.*s", addrlen-3, addrbuf.sau.sun_path+1);
+ tprintf("path=@");
+ printstr(tcp, addr + 3, strlen(addrbuf.sau.sun_path + 1));
}
break;
case AF_INET: