Robustify mpers.awk against invalid input

[strace] / print_time.c

diff --git a/print_time.c b/print_time.c
index 15f6a95387b94a23ab183c59b483243349b9eb56..4d387669df8a6669786c1d7bab21ed05db0b2527 100644 (file)
--- a/print_time.c
+++ b/print_time.c
@@ -16,6 +16,14 @@ typedef struct timeval timeval_t;
 # define UTIME_OMIT ((1l << 30) - 2l)
 #endif
 
+static const char time_fmt[] = "{%jd, %jd}";
+
+static void
+print_timespec_t(const timespec_t *t)
+{
+       tprintf(time_fmt, (intmax_t) t->tv_sec, (intmax_t) t->tv_nsec);
+}
+
 static void
 print_timespec_t_utime(const timespec_t *t)
 {
@@ -27,8 +35,7 @@ print_timespec_t_utime(const timespec_t *t)
                tprints("UTIME_OMIT");
                break;
        default:
-               tprintf("{%jd, %jd}",
-                       (intmax_t) t->tv_sec, (intmax_t) t->tv_nsec);
+               print_timespec_t(t);
                break;
        }
 }
@@ -36,7 +43,35 @@ print_timespec_t_utime(const timespec_t *t)
 static void
 print_timeval_t(const timeval_t *t)
 {
-       tprintf("{%jd, %jd}", (intmax_t) t->tv_sec, (intmax_t) t->tv_usec);
+       tprintf(time_fmt, (intmax_t) t->tv_sec, (intmax_t) t->tv_usec);
+}
+
+MPERS_PRINTER_DECL(void, print_timespec)(struct tcb *tcp, const long addr)
+{
+       timespec_t t;
+
+       if (umove_or_printaddr(tcp, addr, &t))
+               return;
+
+       print_timespec_t(&t);
+}
+
+MPERS_PRINTER_DECL(const char *, sprint_timespec)(struct tcb *tcp, const long addr)
+{
+       timespec_t t;
+       static char buf[sizeof(time_fmt) + 3 * sizeof(t)];
+
+       if (!addr) {
+               strcpy(buf, "NULL");
+       } else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
+                  umove(tcp, addr, &t)) {
+               snprintf(buf, sizeof(buf), "%#lx", addr);
+       } else {
+               snprintf(buf, sizeof(buf), time_fmt,
+                        (intmax_t) t.tv_sec, (intmax_t) t.tv_nsec);
+       }
+
+       return buf;
 }
 
 MPERS_PRINTER_DECL(void, print_timespec_utime_pair)(struct tcb *tcp, const long addr)
@@ -53,6 +88,30 @@ MPERS_PRINTER_DECL(void, print_timespec_utime_pair)(struct tcb *tcp, const long
        tprints("]");
 }
 
+MPERS_PRINTER_DECL(void, print_itimerspec)(struct tcb *tcp, const long addr)
+{
+       timespec_t t[2];
+
+       if (umove_or_printaddr(tcp, addr, &t))
+               return;
+
+       tprints("{it_interval=");
+       print_timespec_t(&t[0]);
+       tprints(", it_value=");
+       print_timespec_t(&t[1]);
+       tprints("}");
+}
+
+MPERS_PRINTER_DECL(void, print_timeval)(struct tcb *tcp, const long addr)
+{
+       timeval_t t;
+
+       if (umove_or_printaddr(tcp, addr, &t))
+               return;
+
+       print_timeval_t(&t);
+}
+
 MPERS_PRINTER_DECL(void, print_timeval_pair)(struct tcb *tcp, const long addr)
 {
        timeval_t t[2];
@@ -67,6 +126,38 @@ MPERS_PRINTER_DECL(void, print_timeval_pair)(struct tcb *tcp, const long addr)
        tprints("]");
 }
 
+MPERS_PRINTER_DECL(const char *, sprint_timeval)(struct tcb *tcp, const long addr)
+{
+       timeval_t t;
+       static char buf[sizeof(time_fmt) + 3 * sizeof(t)];
+
+       if (!addr) {
+               strcpy(buf, "NULL");
+       } else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
+                  umove(tcp, addr, &t)) {
+               snprintf(buf, sizeof(buf), "%#lx", addr);
+       } else {
+               snprintf(buf, sizeof(buf), time_fmt,
+                        (intmax_t) t.tv_sec, (intmax_t) t.tv_usec);
+       }
+
+       return buf;
+}
+
+MPERS_PRINTER_DECL(void, print_itimerval)(struct tcb *tcp, const long addr)
+{
+       timeval_t t[2];
+
+       if (umove_or_printaddr(tcp, addr, &t))
+               return;
+
+       tprints("{it_interval=");
+       print_timeval_t(&t[0]);
+       tprints(", it_value=");
+       print_timeval_t(&t[1]);
+       tprints("}");
+}
+
 SYS_FUNC(time)
 {
        if (exiting(tcp)) {
@@ -78,3 +169,77 @@ SYS_FUNC(time)
 
        return 0;
 }
+
+#ifdef ALPHA
+
+typedef struct {
+       int tv_sec, tv_usec;
+} timeval32_t;
+
+static void
+print_timeval32_t(const timeval32_t *t)
+{
+       tprintf(time_fmt, (intmax_t) t->tv_sec, (intmax_t) t->tv_usec);
+}
+
+void
+print_timeval32(struct tcb *tcp, const long addr)
+{
+       timeval32_t t;
+
+       if (umove_or_printaddr(tcp, addr, &t))
+               return;
+
+       print_timeval32_t(&t);
+}
+
+void
+print_timeval32_pair(struct tcb *tcp, const long addr)
+{
+       timeval32_t t[2];
+
+       if (umove_or_printaddr(tcp, addr, &t))
+               return;
+
+       tprints("[");
+       print_timeval32_t(&t[0]);
+       tprints(", ");
+       print_timeval32_t(&t[1]);
+       tprints("]");
+}
+
+void
+print_itimerval32(struct tcb *tcp, const long addr)
+{
+       timeval32_t t[2];
+
+       if (umove_or_printaddr(tcp, addr, &t))
+               return;
+
+       tprints("{it_interval=");
+       print_timeval32_t(&t[0]);
+       tprints(", it_value=");
+       print_timeval32_t(&t[1]);
+       tprints("}");
+}
+
+const char *
+sprint_timeval32(struct tcb *tcp, const long addr)
+{
+       timeval32_t t;
+       static char buf[sizeof(time_fmt) + 3 * sizeof(t)];
+
+       if (!addr) {
+               strcpy(buf, "NULL");
+       } else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
+                  umove(tcp, addr, &t)) {
+               snprintf(buf, sizeof(buf), "%#lx", addr);
+       } else {
+               snprintf(buf, sizeof(buf), time_fmt,
+                        (intmax_t) t.tv_sec, (intmax_t) t.tv_usec);
+       }
+
+       return buf;
+}
+
+#endif /* ALPHA */