From: Michael Adam <obnox@samba.org>
Date: Sun, 31 Oct 2010 00:04:25 +0000 (+0200)
Subject: librpc/ndr: use new strlen_m_ext_term() in ndr_charset_length(): fix bug #7594
X-Git-Tag: samba-4.0.0alpha14~1357
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=7e382a0496efdcbcd1189ab40a15702c54622200

librpc/ndr: use new strlen_m_ext_term() in ndr_charset_length(): fix bug #7594

This fixes the calculation of needed space for destination unicode charset.

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Wed Nov  3 23:28:07 UTC 2010 on sn-devel-104
---

diff --git a/librpc/ndr/ndr_string.c b/librpc/ndr/ndr_string.c
index e1f3a5245ad..610676cf780 100644
--- a/librpc/ndr/ndr_string.c
+++ b/librpc/ndr/ndr_string.c
@@ -731,11 +731,11 @@ _PUBLIC_ uint32_t ndr_charset_length(const void *var, charset_t chset)
 	case CH_UTF16LE:
 	case CH_UTF16BE:
 	case CH_UTF16MUNGED:
-		return strlen_m_term((const char *)var);
+	case CH_UTF8:
+		return strlen_m_ext_term((const char *)var, CH_UNIX, chset);
 	case CH_DISPLAY:
 	case CH_DOS:
 	case CH_UNIX:
-	case CH_UTF8:
 		return strlen((const char *)var)+1;
 	}