Merge pull request #1303 from csware/win32_consistent_error_encoding

Win32: Make sure error messages are consistently UTF-8 encoded

1 files changed, 5 insertions, 12 deletions

diff --git a/src/errors.c b/src/errors.c
index d9827fb2b..3aa1757b2 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -51,18 +51,11 @@ void giterr_set(int error_class, const char *string, ...)
 
 	if (error_class == GITERR_OS) {
 #ifdef GIT_WIN32
-		if (win32_error_code) {
-			char *lpMsgBuf;
-
-			if (FormatMessageA(
-					FORMAT_MESSAGE_ALLOCATE_BUFFER |
-					FORMAT_MESSAGE_FROM_SYSTEM |
-					FORMAT_MESSAGE_IGNORE_INSERTS,
-					NULL, win32_error_code, 0, (LPSTR)&lpMsgBuf, 0, NULL)) {
-				git_buf_PUTS(&buf, ": ");
-				git_buf_puts(&buf, lpMsgBuf);
-				LocalFree(lpMsgBuf);
-			}
+		char * win32_error = git_win32_get_error_message(win32_error_code);
+		if (win32_error) {
+			git_buf_PUTS(&buf, ": ");
+			git_buf_puts(&buf, win32_error);
+			git__free(win32_error);
 
 			SetLastError(0);
 		}