From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 13 Dec 2006 17:03:02 +0000 (+0000)
Subject: 2006-12-10  Dmitry V. Levin <ldv@altlinux.org>
X-Git-Tag: v4.5.18~260
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac518d10777f9dd95aad22939da6c867cf4c193e;p=strace

2006-12-10  Dmitry V. Levin <ldv@altlinux.org>

	* time.c (sys_timer_create): Check umove() return code.
---

diff --git a/ChangeLog b/ChangeLog
index 48817b71..08ae0dd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-12-10  Dmitry V. Levin <ldv@altlinux.org>
 
+	* time.c (sys_timer_create): Check umove() return code.
+
 	Make several global variables static.
 	#ifdef definitions of rarely unused functions.
 	* defs.h (rflag, tflag, outfname): Remove.
diff --git a/time.c b/time.c
index b27a71ef..ebd788f3 100644
--- a/time.c
+++ b/time.c
@@ -475,13 +475,12 @@ struct tcb *tcp;
 		printsigevent(tcp, tcp->u_arg[1]);
 		tprintf(", ");
 	} else {
-		if (syserror(tcp))
+		void *p;
+
+		if (syserror(tcp) || umove(tcp, tcp->u_arg[2], &p) < 0)
 			tprintf("%#lx", tcp->u_arg[2]);
-		else {
-			void *p;
-			umove(tcp, tcp->u_arg[2], &p);
+		else
 			tprintf("{%p}", p);
-		}
 	}
 	return 0;
 }