From 92a036cc37bb6e058cb86de1cc4d575d20032ce7 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 13 Dec 1999 19:17:40 +0000 Subject: Unicode conversion fix in Japanese environment from Motonobu TAKAHASHI. Jeremy. (This used to be commit decc6ebca29abd78754c275352de58b0de2e2aa5) --- source3/lib/util_unistr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/lib/util_unistr.c') diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c index aee2a21fc0..185e7c3547 100644 --- a/source3/lib/util_unistr.c +++ b/source3/lib/util_unistr.c @@ -61,7 +61,7 @@ int dos_PutUniCode(char *dst,const char *src, ssize_t len) */ if (skip == 2) - val = ((val << 8) | src[1]); + val = ((val << 8) | (src[1] & 0xff)); SSVAL(dst,ret,doscp_to_ucs2[val]); ret += 2; @@ -279,7 +279,7 @@ size_t dos_struni2(char *dst, const char *src, size_t max_len) */ if (skip == 2) - val = ((val << 8) | src[1]); + val = ((val << 8) | (src[1] & 0xff)); SSVAL(dst,0,doscp_to_ucs2[val]); if (skip) -- cgit