sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

r3268: - fixed wildcard handling in new dirlist code

Browse Source 
- ensure that d_name from readdir is not used after closedir
(This used to be commit 5352613342)
This commit is contained in:
Andrew Tridgell
2004-10-26 22:25:34 +00:00
committed by Gerald (Jerry) Carter
parent 2970ff9bd9
commit 731e64cdcf
1 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
source4/ntvfs/posix/pvfs_dirlist.c
View File

@ -28,6 +28,7 @@ struct pvfs_dir {
struct pvfs_state *pvfs; struct pvfs_state *pvfs;
BOOL no_wildcard; BOOL no_wildcard;
char *last_name; char *last_name;
const char *pattern;
off_t offset; off_t offset;
DIR *dir; DIR *dir;
const char *unix_path; const char *unix_path;
@ -60,6 +61,7 @@ static NTSTATUS pvfs_list_no_wildcard(struct pvfs_state *pvfs, struct pvfs_filen
dir->dir = NULL; dir->dir = NULL;
dir->offset = 0; dir->offset = 0;
dir->pattern = NULL;
return NT_STATUS_OK; return NT_STATUS_OK;
} }
@ -111,6 +113,11 @@ NTSTATUS pvfs_list_start(struct pvfs_state *pvfs, struct pvfs_filename *name,
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
dir->pattern = talloc_strdup(dir, pattern);
if (dir->pattern == NULL) {
return NT_STATUS_NO_MEMORY;
}
dir->dir = opendir(name->full_name); dir->dir = opendir(name->full_name);
if (!dir->dir) { if (!dir->dir) {
return pvfs_map_errno(pvfs, errno); return pvfs_map_errno(pvfs, errno);
@ -147,20 +154,35 @@ const char *pvfs_list_next(struct pvfs_dir *dir, uint_t *ofs)
dir->offset = *ofs; dir->offset = *ofs;
} }
de = readdir(dir->dir); while ((de = readdir(dir->dir))) {
if (de == NULL) { const char *dname = de->d_name;
dir->last_name = NULL;
dir->end_of_search = True; if (ms_fnmatch(dir->pattern, dname,
pvfs_list_hibernate(dir); dir->pvfs->tcon->smb_conn->negotiate.protocol) != 0) {
return NULL; char *short_name = pvfs_short_name_component(dir->pvfs, dname);
if (short_name == NULL ||
ms_fnmatch(dir->pattern, short_name,
dir->pvfs->tcon->smb_conn->negotiate.protocol) != 0) {
talloc_free(short_name);
continue;
}
talloc_free(short_name);
} }
dir->offset = telldir(dir->dir); dir->offset = telldir(dir->dir);
(*ofs) = dir->offset; (*ofs) = dir->offset;
dir->last_name = de->d_name; if (dir->last_name) talloc_free(dir->last_name);
dir->last_name = talloc_strdup(dir, de->d_name);
return dir->last_name; return dir->last_name;
}
if (dir->last_name) talloc_free(dir->last_name);
dir->last_name = NULL;
dir->end_of_search = True;
pvfs_list_hibernate(dir);
return NULL;
} }
/* /*
@ -173,6 +195,10 @@ void pvfs_list_hibernate(struct pvfs_dir *dir)
closedir(dir->dir); closedir(dir->dir);
dir->dir = NULL; dir->dir = NULL;
} }
if (!dir->no_wildcard && dir->last_name) {
talloc_free(dir->last_name);
dir->last_name = NULL;
}
} }
@ -233,7 +259,8 @@ NTSTATUS pvfs_list_seek(struct pvfs_dir *dir, const char *name, uint_t *ofs)
return status; return status;
} }
if (StrCaseCmp(name, dir->last_name) == 0) { if (dir->last_name &&
StrCaseCmp(name, dir->last_name) == 0) {
*ofs = dir->offset; *ofs = dir->offset;
return NT_STATUS_OK; return NT_STATUS_OK;
} }
@ -244,6 +271,8 @@ NTSTATUS pvfs_list_seek(struct pvfs_dir *dir, const char *name, uint_t *ofs)
if (StrCaseCmp(name, de->d_name) == 0) { if (StrCaseCmp(name, de->d_name) == 0) {
dir->offset = telldir(dir->dir); dir->offset = telldir(dir->dir);
*ofs = dir->offset; *ofs = dir->offset;
if (dir->last_name) talloc_free(dir->last_name);
dir->last_name = talloc_strdup(dir, de->d_name);
return NT_STATUS_OK; return NT_STATUS_OK;
} }
} }