From 2323a72ac3da4939309015a6840d815aa0754422 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Wed, 5 Oct 2016 13:51:05 +0200 Subject: _gnutls_utf8_to_ucs2: force NFC normalization form in windows --- lib/system/iconv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/system') diff --git a/lib/system/iconv.c b/lib/system/iconv.c index d89ca05df2..c133ea382e 100644 --- a/lib/system/iconv.c +++ b/lib/system/iconv.c @@ -128,7 +128,7 @@ int _gnutls_utf8_to_ucs2(const void *data, size_t size, unsigned i; int len = 0; char *dst = NULL; - static unsigned flags = 0; + static unsigned flags = MB_PRECOMPOSED; static int checked = 0; uint8_t tmp; @@ -138,7 +138,7 @@ int _gnutls_utf8_to_ucs2(const void *data, size_t size, MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, "\xff\xff\xff\xff\xff\xff\x00", -1, NULL, 0); if (ret > 0) - flags = MB_ERR_INVALID_CHARS; + flags |= MB_ERR_INVALID_CHARS; checked = 1; } -- cgit v1.2.1