opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Return ENOTDIR errno if inode is not a directory. 

- Fix stupid bug where we attempt to close ia_na when it is null.

(Logical change 1.168)
edge.strict_endians
cantab.net!aia21 2003-08-03 14:54:06 +00:00
parent fb2833bef3
commit 8b9987bf4d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libntfs/dir.c
View File

@ -612,6 +612,11 @@ int ntfs_readdir(ntfs_inode *dir_ni, s64 *pos,
return -1;
}
if (!(dir_ni->mrec->flags & MFT_RECORD_IS_DIRECTORY)) {
errno = ENOTDIR;
return -1;
}
vol = dir_ni->vol;
Dprintf("Entering for inode 0x%Lx, *pos 0x%Lx.\n",
@ -898,7 +903,8 @@ EOD:
done:
if (bmp_na)
ntfs_attr_close(bmp_na);
ntfs_attr_close(ia_na);
if (ia_na)
ntfs_attr_close(ia_na);
#ifdef DEBUG
if (!rc)
Dprintf("EOD, *pos 0x%Lx, returning 0.\n", (long long)*pos);
@ -916,7 +922,8 @@ err_out:
ntfs_attr_put_search_ctx(ctx);
if (bmp_na)
ntfs_attr_close(bmp_na);
ntfs_attr_close(ia_na);
if (ia_na)
ntfs_attr_close(ia_na);
errno = eo;
return -1;
}