diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-08-14 22:27:18 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-08-14 22:27:18 +0400 |
| commit | 719ffe8792ee2c51b626b7989495c5b3f747114c (patch) | |
| tree | 2eac963cffc67b87b081d7ce3d3cf4bec92c791c /winsup/cygwin | |
| parent | e684ace44e546bbdb0496f3bca909e4bec0a3f85 (diff) | |
* fhandler_disk_file.cc (fhandler_disk_file::readdir): Fix length
check for ".." dir.
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 2473cf962..b1137280e 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2009-08-14 Corinna Vinschen <corinna@vinschen.de> + * fhandler_disk_file.cc (fhandler_disk_file::readdir): Fix length + check for ".." dir. + +2009-08-14 Corinna Vinschen <corinna@vinschen.de> + * fhandler_disk_file.cc (fhandler_disk_file::readdir): Change comment to be fair. diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index 2c476e482..5e66ae96e 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -1971,7 +1971,7 @@ go_ahead: come first. */ if (FileNameLength == sizeof (WCHAR) && FileName[0] == '.') de->d_ino = get_ino_by_handle (pc, get_handle ()); - else if (FileNameLength == sizeof (WCHAR) + else if (FileNameLength == 2 * sizeof (WCHAR) && FileName[0] == L'.' && FileName[1] == L'.') { if (!(dir->__flags & dirent_isroot)) |