The branch, v3-5-test has been updated
via 73a7100 s3: Fix the charset_pull routine
from 18516e0 s3: fix build on platforms without st_blocks and st_blksize
stat struct members
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit 73a7100a21a50873d09cef7a100ed75c4095863f
Author: Volker Lendecke <[email protected]>
Date: Mon Sep 6 15:13:48 2010 +0200
s3: Fix the charset_pull routine
In the push routine we do the SVAL, so we should do the SSVAL here.
Fix bug #7531 (3.5.3 unusable on solaris 10).
-----------------------------------------------------------------------
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 2c8aa41..c9425ef 100644
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -242,7 +242,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
