Use stdlib to avoid ubsan errors

pull/10746/head
Craig Tiller 8 years ago
parent 91eb28f6bc
commit d1a6423199
  1. 29
      test/core/support/time_test.c

@ -47,32 +47,17 @@ static void to_fp(void *arg, const char *buf, size_t len) {
fwrite(buf, 1, len, (FILE *)arg); fwrite(buf, 1, len, (FILE *)arg);
} }
/* Convert gpr_uintmax x to ascii base b (2..16), and write with
(*writer)(arg, ...), zero padding to "chars" digits). */
static void u_to_s(uintmax_t x, unsigned base, int chars,
void (*writer)(void *arg, const char *buf, size_t len),
void *arg) {
char buf[64];
char *p = buf + sizeof(buf);
do {
*--p = "0123456789abcdef"[x % base];
x /= base;
chars--;
} while (x != 0 || chars > 0);
(*writer)(arg, p, (size_t)(buf + sizeof(buf) - p));
}
/* Convert gpr_intmax x to ascii base b (2..16), and write with /* Convert gpr_intmax x to ascii base b (2..16), and write with
(*writer)(arg, ...), zero padding to "chars" digits). */ (*writer)(arg, ...), zero padding to "chars" digits). */
static void i_to_s(intmax_t x, unsigned base, int chars, static void i_to_s(intmax_t x, int base, int chars,
void (*writer)(void *arg, const char *buf, size_t len), void (*writer)(void *arg, const char *buf, size_t len),
void *arg) { void *arg) {
if (x < 0) { char buf[64];
(*writer)(arg, "-", 1); char fmt[32];
u_to_s((uintmax_t)-x, base, chars - 1, writer, arg); GPR_ASSERT(base == 16 || base == 10);
} else { sprintf(fmt, "%%0%d%s", chars, base == 16 ? PRIxMAX : PRIdMAX);
u_to_s((uintmax_t)x, base, chars, writer, arg); sprintf(buf, fmt, x);
} (*writer)(arg, buf, strlen(buf));
} }
/* Convert ts to ascii, and write with (*writer)(arg, ...). */ /* Convert ts to ascii, and write with (*writer)(arg, ...). */

Loading…
Cancel
Save