diff options
author | Thomas Adam <thomas@xteddy.org> | 2014-10-16 16:46:31 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2014-10-16 16:46:31 +0100 |
commit | a77355b6bf9a0beb2e9d0a8b9613266984bb598d (patch) | |
tree | 38ca21b0aeb986adea2de22cc12adda8a52cf4c5 /utf8.c | |
parent | 2874a431c050527244a56e7f241baf053c722f88 (diff) | |
parent | a27ba6e38006c12c48de88600b8cff9f6aabfed7 (diff) | |
download | rtmux-a77355b6bf9a0beb2e9d0a8b9613266984bb598d.tar.gz rtmux-a77355b6bf9a0beb2e9d0a8b9613266984bb598d.tar.bz2 rtmux-a77355b6bf9a0beb2e9d0a8b9613266984bb598d.zip |
Merge branch 'obsd-master'
Diffstat (limited to 'utf8.c')
-rw-r--r-- | utf8.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -420,7 +420,7 @@ utf8_fromcstr(const char *src) n = 0; while (*src != '\0') { - dst = xrealloc(dst, n + 1, sizeof *dst); + dst = xreallocarray(dst, n + 1, sizeof *dst); if (utf8_open(&dst[n], *src)) { more = 1; while (*++src != '\0' && more) @@ -437,7 +437,7 @@ utf8_fromcstr(const char *src) n++; } - dst = xrealloc(dst, n + 1, sizeof *dst); + dst = xreallocarray(dst, n + 1, sizeof *dst); dst[n].size = 0; return (dst); } @@ -453,12 +453,12 @@ utf8_tocstr(struct utf8_data *src) n = 0; for(; src->size != 0; src++) { - dst = xrealloc(dst, n + src->size, 1); + dst = xreallocarray(dst, n + src->size, 1); memcpy(dst + n, src->data, src->size); n += src->size; } - dst = xrealloc(dst, n + 1, 1); + dst = xreallocarray(dst, n + 1, 1); dst[n] = '\0'; return (dst); } |