diff options
author | Jeff King <peff@peff.net> | 2018-07-24 13:50:33 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-07-24 20:19:29 +0300 |
commit | c7d017d7e1cca37ca20f73c11fa9f1b319a2c3a5 (patch) | |
tree | 41b17395ddd01ae0436d78b906578f7b4861c054 /utf8.c | |
parent | 77aa03d6c7f07db4a5d34afe8f5b3a55e801057c (diff) |
reencode_string: use size_t for string lengths
The iconv interface takes a size_t, which is the appropriate
type for an in-memory buffer. But our reencode_string_*
functions use integers, meaning we may get confusing results
when the sizes exceed INT_MAX. Let's use size_t
consistently.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'utf8.c')
-rw-r--r-- | utf8.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -470,7 +470,7 @@ int utf8_fprintf(FILE *stream, const char *format, ...) #else typedef char * iconv_ibp; #endif -char *reencode_string_iconv(const char *in, size_t insz, iconv_t conv, int *outsz_p) +char *reencode_string_iconv(const char *in, size_t insz, iconv_t conv, size_t *outsz_p) { size_t outsz, outalloc; char *out, *outpos; @@ -534,9 +534,9 @@ static const char *fallback_encoding(const char *name) return name; } -char *reencode_string_len(const char *in, int insz, +char *reencode_string_len(const char *in, size_t insz, const char *out_encoding, const char *in_encoding, - int *outsz) + size_t *outsz) { iconv_t conv; char *out; |