summaryrefslogtreecommitdiffstats
path: root/source/lib/util_unistr.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1999-12-13 19:17:40 +0000
committerJeremy Allison <jra@samba.org>1999-12-13 19:17:40 +0000
commitdecc6ebca29abd78754c275352de58b0de2e2aa5 (patch)
tree7088588030cf0fdef9f3948eac3f700d90e37e23 /source/lib/util_unistr.c
parentd7b208786590b5a28618590172b8d523627dda09 (diff)
downloadsamba-decc6ebca29abd78754c275352de58b0de2e2aa5.tar.gz
samba-decc6ebca29abd78754c275352de58b0de2e2aa5.tar.xz
samba-decc6ebca29abd78754c275352de58b0de2e2aa5.zip
Unicode conversion fix in Japanese environment from Motonobu TAKAHASHI.
Jeremy.
Diffstat (limited to 'source/lib/util_unistr.c')
-rw-r--r--source/lib/util_unistr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/lib/util_unistr.c b/source/lib/util_unistr.c
index aee2a21fc0a..185e7c35477 100644
--- a/source/lib/util_unistr.c
+++ b/source/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)