Fix bug #8005 - smbtorture4 BASE-TCONDEV fails when tested on Samba

When pulling non-aligned ucs2 strings, we neglected to add in the
pad byte to the buffer length we've eaten. This caused the device
string in TCONX (which seems to be one of the few places that uses
non-aligned ucs2 strings) to be incorrectly read.

Volker please check.

Jeremy.
(cherry picked from commit e59a950c049679f0394ea41b463dbb9837eb5e63)

diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 9ac9930267ef6614738f0f5d75a933d3d8d958b9..718f8108e57e4b6b4f8e515f4f2735a8c742f530 100644 (file)
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -1342,6 +1342,7 @@ bool push_utf8_talloc(TALLOC_CTX *ctx, char **dest, const char *src,
 size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t dest_len, size_t src_len, int flags)
 {
        size_t ret;
+       size_t ucs2_align_len = 0;
 
        if (dest_len == (size_t)-1) {
                /* No longer allow dest_len of -1. */
@@ -1359,6 +1360,7 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t dest_
                src = (const void *)((const char *)src + 1);
                if (src_len != (size_t)-1)
                        src_len--;
+               ucs2_align_len = 1;
        }
 
        if (flags & STR_TERMINATE) {
@@ -1394,7 +1396,7 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t dest_
                dest[0] = 0;
        }
 
-       return src_len;
+       return src_len + ucs2_align_len;
 }
 
 /**
@@ -1420,6 +1422,7 @@ size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx,
 {
        char *dest;
        size_t dest_len;
+       size_t ucs2_align_len = 0;
 
        *ppdest = NULL;
 
@@ -1438,6 +1441,7 @@ size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx,
                src = (const void *)((const char *)src + 1);
                if (src_len != (size_t)-1)
                        src_len--;
+               ucs2_align_len = 1;
        }
 
        if (flags & STR_TERMINATE) {
@@ -1503,7 +1507,7 @@ size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx,
        }
 
        *ppdest = dest;
-       return src_len;
+       return src_len + ucs2_align_len;
 }
 
 size_t pull_ucs2_fstring(char *dest, const void *src)