~ubuntu-branches/ubuntu/lucid/samba/lucid-proposed

diff -uNr samba-3.0.14a.orig/source/libsmb/clilist.c samba-3.0.14a/source/libsmb/clilist.c

--- samba-3.0.14a.orig/source/libsmb/clilist.c  2005-06-02 08:26:15.000000000 -0700

+++ samba-3.0.14a/source/libsmb/clilist.c       2005-06-02 08:48:04.000000000 -0700

@@ -29,8 +29,8 @@

  by NT and 2 is used by OS/2

 ****************************************************************************/

 

-static size_t interpret_long_filename(struct cli_state *cli,

-                                  int level,char *p,file_info *finfo, uint32 *p_resume_key)

+static size_t interpret_long_filename(struct cli_state *cli, int level,char *p,file_info *finfo,

+                                     uint32 *p_resume_key, DATA_BLOB *p_last_name_raw, uint32 *p_last_name_raw_len)

 {

        extern file_info def_finfo;

        file_info finfo2;

@@ -39,7 +39,9 @@

 

        if (!finfo) finfo = &finfo2;

 

-       *p_resume_key = 0;

+       if (p_resume_key) {

+               *p_resume_key = 0;

+       }

        memcpy(finfo,&def_finfo,sizeof(*finfo));

 

        switch (level) {

@@ -86,7 +88,9 @@

                        size_t namelen, slen;

                        p += 4; /* next entry offset */

 

-                       *p_resume_key = IVAL(p,0);

+                       if (p_resume_key) {

+                               *p_resume_key = IVAL(p,0);

+                       }

                        p += 4; /* fileindex */

                                

                        /* these dates appear to arrive in a

@@ -133,6 +137,22 @@

                        clistr_pull(cli, finfo->name, p,

                                    sizeof(finfo->name),

                                    namelen, 0);

+

+                       /* To be robust in the face of unicode conversion failures

+                          we need to copy the raw bytes of the last name seen here.

+                          Namelen doesn't include the terminating unicode null, so

+                          copy it here. */

+

+                       if (p_last_name_raw && p_last_name_raw_len) {

+                               if (namelen + 2 > p_last_name_raw->length) {

+                                       memset(p_last_name_raw->data, '\0', sizeof(p_last_name_raw->length));

+                                       *p_last_name_raw_len = 0;

+                               } else {

+                                       memcpy(p_last_name_raw->data, p, namelen);

+                                       SSVAL(p_last_name_raw->data, namelen, 0);

+                                       *p_last_name_raw_len = namelen + 2;

+                               }

+                       }

                        return (size_t)IVAL(base, 0);

                }

        }

@@ -173,6 +193,8 @@

        pstring param;

        const char *mnt;

        uint32 resume_key = 0;

+       uint32 last_name_raw_len = 0;

+       DATA_BLOB last_name_raw = data_blob(NULL, 2*sizeof(pstring));

 

        /* NT uses 260, OS/2 uses 2. Both accept 1. */

        info_level = (cli->capabilities&CAP_NT_SMBS)?260:1;

@@ -214,8 +236,12 @@

                           can miss filenames. Use last filename continue instead. JRA */

                        SSVAL(param,10,(FLAG_TRANS2_FIND_REQUIRE_RESUME|FLAG_TRANS2_FIND_CLOSE_IF_END));        /* resume required + close on end */

                        p = param+12;

-                       p += clistr_push(cli, param+12, mask, sizeof(param)-12, 

-                                        STR_TERMINATE);

+                       if (last_name_raw_len && (last_name_raw_len < (sizeof(param)-12))) {

+                               memcpy(p, last_name_raw.data, last_name_raw_len);

+                               p += last_name_raw_len;

+                       } else {

+                               p += clistr_push(cli, param+12, mask, sizeof(param)-12, STR_TERMINATE);

+                       }

                }

 

                param_len = PTR_DIFF(p, param);

@@ -282,7 +308,8 @@

                                /* Last entry - fixup the last offset length. */

                                SIVAL(p2,0,PTR_DIFF((rdata + data_len),p2));

                        }

-                       p2 += interpret_long_filename(cli,info_level,p2,&finfo,&resume_key);

+                       p2 += interpret_long_filename(cli,info_level,p2,&finfo,

+                                                       &resume_key,&last_name_raw,&last_name_raw_len);

                }

 

                if (ff_lastname > 0) {

@@ -322,12 +349,13 @@

        mnt = cli_cm_get_mntpoint( cli );

 

        for (p=dirlist,i=0;i<total_received;i++) {

-               p += interpret_long_filename(cli,info_level,p,&finfo,&resume_key);

+               p += interpret_long_filename(cli,info_level,p,&finfo,NULL,NULL,NULL);

                fn( mnt,&finfo, Mask, state );

        }

 

-       /* free up the dirlist buffer */

+       /* free up the dirlist buffer and last name raw blob */

        SAFE_FREE(dirlist);

+       data_blob_free(&last_name_raw);

        return(total_received);

 }