From 351eb266176f6a4c204e92c206ce3791237b195a Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 18 Mar 2004 17:58:47 +0000 Subject: [PATCH] Correctness patch from fumiya@miraclelinux.com to count characters correctly, doesn't affect what got put on the wire. Jeremy. (This used to be commit 05243a8de06b6589e2405a4a7be25cdf5d338c10) --- source3/lib/charcnv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index f6028bb1341..11b1448f1eb 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -839,6 +839,9 @@ size_t push_ascii_nstring(void *dest, const char *src) smb_panic("failed to create UCS2 buffer"); } + /* We're using buffer_len below to count ucs2 characters, not bytes. */ + buffer_len /= sizeof(smb_ucs2_t); + dest_len = 0; for (i = 0; buffer[i] != 0 && (i < buffer_len); i++) { unsigned char mb[10]; -- 2.11.4.GIT