sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-31 17:18:04 +03:00
Code

r5632: Fix infinite looping bug found by nasty BlueArc test :-).

Browse Source 
When finding a singleton directory remember that we're
at the end and don't continuously return the same name.
Jeremy.
This commit is contained in:
Jeremy Allison 2005-03-03 02:04:36 +00:00 committed by Gerald (Jerry) Carter
parent 0322c58846
commit 3da5006027
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/smbd/dir.c
View File

@ -525,10 +525,17 @@ const char *dptr_ReadDirName(struct dptr_struct *dptr, long *poffset, SMB_STRUCT
pstring pathreal;
ZERO_STRUCTP(pst);
if (dptr->has_wild) {
return dptr_normal_ReadDirName(dptr, poffset, pst);
}
/* If poffset is -1 then we know we returned this name before and we have
no wildcards. We're at the end of the directory. */
if (*poffset == -1) {
return NULL;
}
/* We know the stored wcard contains no wildcard characters. See if we can match
with a stat call. If we can't, then set has_wild to true to
prevent us from doing this on every call. */
@ -540,6 +547,9 @@ const char *dptr_ReadDirName(struct dptr_struct *dptr, long *poffset, SMB_STRUCT
}
if (VALID_STAT(*pst)) {
/* We need to set the underlying dir_hdn offset to -1 also as
this function is usually called with the output from TellDir. */
dptr->dir_hnd->offset = *poffset = -1;
return dptr->wcard;
}
@ -548,11 +558,17 @@ const char *dptr_ReadDirName(struct dptr_struct *dptr, long *poffset, SMB_STRUCT
pstrcat(pathreal,dptr->wcard);
if (SMB_VFS_STAT(dptr->conn,pathreal,pst) == 0) {
/* We need to set the underlying dir_hdn offset to -1 also as
this function is usually called with the output from TellDir. */
dptr->dir_hnd->offset = *poffset = -1;
return dptr->wcard;
} else {
/* If we get any other error than ENOENT or ENOTDIR
then the file exists we just can't stat it. */
if (errno != ENOENT && errno != ENOTDIR) {
/* We need to set the underlying dir_hdn offset to -1 also as
this function is usually called with the output from TellDir. */
dptr->dir_hnd->offset = *poffset = -1;
return dptr->wcard;
}
}
@ -563,6 +579,9 @@ const char *dptr_ReadDirName(struct dptr_struct *dptr, long *poffset, SMB_STRUCT
with a stat we will fail. */
if (dptr->conn->case_sensitive) {
/* We need to set the underlying dir_hdn offset to -1 also as
this function is usually called with the output from TellDir. */
dptr->dir_hnd->offset = *poffset = -1;
return NULL;
} else {
return dptr_normal_ReadDirName(dptr, poffset, pst);
@ -1033,6 +1052,7 @@ const char *ReadDirName(struct smb_Dir *dirp, long *poffset)
*poffset = e->offset= dirp->offset;
return e->name;
}
dirp->offset = -1;
return NULL;
}