2009-01-01 Andreas Schwab <schwab@suse.de>

	* net.c (sys_accept): Properly decode third argument as pointer to
	int.

2 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 698f9ad6b..2a813ec29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-01  Andreas Schwab  <schwab@suse.de>
+
+	* net.c (sys_accept): Properly decode third argument as pointer to
+	int.
+
 2008-12-30  Denys Vlasenko  <dvlasenk@redhat.com>
 
 	Experimental support for -D option.
diff --git a/net.c b/net.c
index b29423075..be8896970 100644
--- a/net.c
+++ b/net.c
@@ -1315,13 +1315,15 @@ struct tcb *tcp;
 	} else if (!tcp->u_arg[2])
 		tprintf("%#lx, NULL", tcp->u_arg[1]);
 	else {
-		if (tcp->u_arg[1] == 0 || syserror(tcp)) {
+		int len;
+		if (tcp->u_arg[1] == 0 || syserror(tcp)
+		    || umove (tcp, tcp->u_arg[2], &len) < 0) {
 			tprintf("%#lx", tcp->u_arg[1]);
 		} else {
-			printsock(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+			printsock(tcp, tcp->u_arg[1], len);
 		}
 		tprintf(", ");
-		printnum(tcp, tcp->u_arg[2], "%lu");
+		printnum_int(tcp, tcp->u_arg[2], "%u");
 	}
 	return 0;
 }