diff options
| -rw-r--r-- | src/path.c | 2 | ||||
| -rw-r--r-- | tests/core/iconv.c | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/path.c b/src/path.c index 1dccf90da..56b6c87f9 100644 --- a/src/path.c +++ b/src/path.c @@ -782,6 +782,8 @@ int git_path_iconv(git_path_iconv_t *ic, char **in, size_t *inlen) !git_path_has_non_ascii(*in, *inlen)) return 0; + git_buf_truncate(&ic->buf, 0); + while (1) { if (git_buf_grow(&ic->buf, wantlen + 1) < 0) return -1; diff --git a/tests/core/iconv.c b/tests/core/iconv.c index 8aedab206..cb85f458a 100644 --- a/tests/core/iconv.c +++ b/tests/core/iconv.c @@ -39,8 +39,9 @@ void test_core_iconv__decomposed_to_precomposed(void) { #ifdef GIT_USE_ICONV char *data = nfd; - size_t datalen = strlen(nfd); + size_t datalen, nfdlen = strlen(nfd); + datalen = nfdlen; cl_git_pass(git_path_iconv(&ic, &data, &datalen)); GIT_UNUSED(datalen); @@ -48,6 +49,15 @@ void test_core_iconv__decomposed_to_precomposed(void) * (on platforms where iconv is enabled, of course). */ cl_assert_equal_s(nfc, data); + + /* should be able to do it multiple times with the same git_path_iconv_t */ + data = nfd; datalen = nfdlen; + cl_git_pass(git_path_iconv(&ic, &data, &datalen)); + cl_assert_equal_s(nfc, data); + + data = nfd; datalen = nfdlen; + cl_git_pass(git_path_iconv(&ic, &data, &datalen)); + cl_assert_equal_s(nfc, data); #endif } |