summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2006-12-13 17:03:02 +0000
committerDmitry V. Levin <ldv@altlinux.org>2006-12-13 17:03:02 +0000
commitac518d10777f9dd95aad22939da6c867cf4c193e (patch)
treeb765b8172d9b92f7f104cf03f573cc5177870176
parentb9fe011cdfb0a3014e68a6e82007b6c2703a340b (diff)
downloadstrace-ac518d10777f9dd95aad22939da6c867cf4c193e.tar.gz
strace-ac518d10777f9dd95aad22939da6c867cf4c193e.tar.bz2
strace-ac518d10777f9dd95aad22939da6c867cf4c193e.tar.xz
2006-12-10 Dmitry V. Levin <ldv@altlinux.org>
* time.c (sys_timer_create): Check umove() return code.
-rw-r--r--ChangeLog2
-rw-r--r--time.c9
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 48817b7..08ae0dd 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 b27a71e..ebd788f 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;
}