diff options
author | Volker Lendecke <vl@samba.org> | 2010-09-06 15:13:48 +0200 |
---|---|---|
committer | Volker Lendecke <vl@samba.org> | 2010-09-19 21:33:25 -0700 |
commit | 1c8fd86a1dcffd0e829d218b7d3b689c24be8a64 (patch) | |
tree | 6d78497b151b4a0cae04231e9334783fe719ea0b | |
parent | dbfb42c1b50e9372184ad170f10ba75b87565965 (diff) | |
download | samba-1c8fd86a1dcffd0e829d218b7d3b689c24be8a64.tar.gz samba-1c8fd86a1dcffd0e829d218b7d3b689c24be8a64.tar.bz2 samba-1c8fd86a1dcffd0e829d218b7d3b689c24be8a64.zip |
s3: Fix the charset_pull routine (bug 7531)
In the push routine we do the SVAL, so we should do the SSVAL here.
-rw-r--r-- | lib/util/charset/charset.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h index 68907aa593..bd08f7efd9 100644 --- a/lib/util/charset/charset.h +++ b/lib/util/charset/charset.h @@ -266,7 +266,7 @@ static size_t CHARSETNAME ## _pull(void *cd, const char **inbuf, size_t *inbytes char **outbuf, size_t *outbytesleft) \ { \ while (*inbytesleft >= 1 && *outbytesleft >= 2) { \ - *(uint16*)(*outbuf) = to_ucs2[((unsigned char*)(*inbuf))[0]]; \ + SSVAL(*outbuf, 0, to_ucs2[((unsigned char*)(*inbuf))[0]]); \ (*inbytesleft) -= 1; \ (*outbytesleft) -= 2; \ (*inbuf) += 1; \ |