summaryrefslogtreecommitdiff
path: root/lib/system
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2016-10-05 13:51:05 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2016-10-06 08:43:50 +0200
commit2323a72ac3da4939309015a6840d815aa0754422 (patch)
tree20bc588d6423b0d4e989491a194a28ed2b362466 /lib/system
parentd258ebe555d172ecf7fe23c59cfbb5549b5216a6 (diff)
downloadgnutls-2323a72ac3da4939309015a6840d815aa0754422.tar.gz
_gnutls_utf8_to_ucs2: force NFC normalization form in windows
Diffstat (limited to 'lib/system')
-rw-r--r--lib/system/iconv.c4
1 files changed, 2 insertions, 2 deletions
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;
}