The branch, v3-6-test has been updated
via c9d78fc s3: Fix the charset_pull routine (bug 7531)
from 6fd8f65 s3: remove TvalDiff macro, we can use the shared
usec_time_diff function (cherry picked from commit
6bc68fabb81d019e017d7f51fdd0b275b3f78609)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit c9d78fc3585fb9b6139e130d1f07c2931641eab5
Author: Volker Lendecke <[email protected]>
Date: Mon Sep 6 15:13:48 2010 +0200
s3: Fix the charset_pull routine (bug 7531)
In the push routine we do the SVAL, so we should do the SSVAL here.
-----------------------------------------------------------------------
Summary of changes:
lib/util/charset/charset.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index 68907aa..bd08f7e 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;
\
--
Samba Shared Repository
