diff options
| author | Sven Strickroth <email@cs-ware.de> | 2013-02-01 22:14:52 +0100 |
|---|---|---|
| committer | Sven Strickroth <email@cs-ware.de> | 2013-02-01 22:17:34 +0100 |
| commit | 89ad1c57a351809d3173e22a26c84e7a16adbe6b (patch) | |
| tree | 4fa5cf372349b21878bb8da9beda4ae0b1181ce7 | |
| parent | b0dc81f055d4eb523c92bc859d5641e72d343b00 (diff) | |
| download | libgit2-89ad1c57a351809d3173e22a26c84e7a16adbe6b.tar.gz | |
Get utf8_size from WideCharToMultiByte instead of guessing it
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| -rw-r--r-- | src/errors.c | 6 | ||||
| -rw-r--r-- | src/netops.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/errors.c b/src/errors.c index c64db7b85..1ab2894ed 100644 --- a/src/errors.c +++ b/src/errors.c @@ -61,11 +61,11 @@ void giterr_set(int error_class, const char *string, ...) (LPWSTR)&lpMsgBuf, 0, NULL); if (size) { - int utf8_size = size * 4 + 1; + int utf8_size = WideCharToMultiByte(CP_UTF8, 0, lpMsgBuf, -1, NULL, 0, NULL, NULL); - char *lpMsgBuf_utf8 = git__calloc(utf8_size, sizeof(char)); + char *lpMsgBuf_utf8 = git__malloc(utf8_size * sizeof(char)); GITERR_CHECK_ALLOC(lpMsgBuf_utf8); - WideCharToMultiByte(CP_UTF8, 0, lpMsgBuf, size, lpMsgBuf_utf8, utf8_size, NULL, NULL); + WideCharToMultiByte(CP_UTF8, 0, lpMsgBuf, -1, lpMsgBuf_utf8, utf8_size, NULL, NULL); git_buf_PUTS(&buf, ": "); git_buf_puts(&buf, lpMsgBuf_utf8); diff --git a/src/netops.c b/src/netops.c index 851ed4219..c5554ef86 100644 --- a/src/netops.c +++ b/src/netops.c @@ -46,10 +46,10 @@ static void net_set_error(const char *str) int size = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, 0, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&err_str, 0, 0); - int utf8_size = size * 4 + 1; - char * err_str_utf8 = git__calloc(utf8_size, sizeof(char)); + int utf8_size = WideCharToMultiByte(CP_UTF8, 0, err_str, -1, NULL, 0, NULL, NULL); + char * err_str_utf8 = git__malloc(utf8_size * sizeof(char)); GITERR_CHECK_ALLOC(err_str_utf8); - WideCharToMultiByte(CP_UTF8, 0, err_str, size, err_str_utf8, utf8_size, NULL, NULL); + WideCharToMultiByte(CP_UTF8, 0, err_str, -1, err_str_utf8, utf8_size, NULL, NULL); giterr_set(GITERR_NET, "%s: %s", str, err_str_utf8); LocalFree(err_str); |