From: Jeremy Allison <jra@samba.org>
Date: Thu, 18 Mar 2004 17:58:47 +0000 (+0000)
Subject: Correctness patch from fumiya@miraclelinux.com to count characters correctly,
X-Git-Tag: samba-4.0.0alpha6~801^2~11793^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=351eb266176f6a4c204e92c206ce3791237b195a;p=thirdparty%2Fsamba.git

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)
---

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];