The branch, master has been updated
       via  1c8fd86 s3: Fix the charset_pull routine (bug 7531)
      from  dbfb42c s3-waf: Build libwbclient as dynamic library

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1c8fd86a1dcffd0e829d218b7d3b689c24be8a64
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

Reply via email to