diff options
author | 2017-04-19 15:34:29 -0700 | |
---|---|---|
committer | 2017-04-19 15:34:29 -0700 | |
commit | d1a6423199d3b38007e65d2a9cad492e7ebc25cc (patch) | |
tree | 1e33cded103b58612b3d134c9e0cf3a2ccbef628 /test/core/support | |
parent | 91eb28f6bcf377da3cbae6f3a566be5b7645e194 (diff) |
Use stdlib to avoid ubsan errors
Diffstat (limited to 'test/core/support')
-rw-r--r-- | test/core/support/time_test.c | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/test/core/support/time_test.c b/test/core/support/time_test.c index 4cb36a788c..00d0b76503 100644 --- a/test/core/support/time_test.c +++ b/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); } -/* 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 (*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 *arg) { - if (x < 0) { - (*writer)(arg, "-", 1); - u_to_s((uintmax_t)-x, base, chars - 1, writer, arg); - } else { - u_to_s((uintmax_t)x, base, chars, writer, arg); - } + char buf[64]; + char fmt[32]; + GPR_ASSERT(base == 16 || base == 10); + sprintf(fmt, "%%0%d%s", chars, base == 16 ? PRIxMAX : PRIdMAX); + sprintf(buf, fmt, x); + (*writer)(arg, buf, strlen(buf)); } /* Convert ts to ascii, and write with (*writer)(arg, ...). */ |