JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* dir.cc (opendir): Fix indentation.

Browse Source 
* fhandler_disk_file.cc (fhandler_disk_file::opendir): Move storing
	fhandler in file descriptor table to some point very late in function
	to avoid double free'ing.  Add comment to explain what happens.
	Add label free_mounts and don't forget to delete __DIR_mounts structure
	if NtOpenFile fails.
This commit is contained in:
Corinna Vinschen 2006-03-03 20:19:26 +00:00
parent 961fe49069
commit ecdee6e98a
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,12 @@
2006-03-03 Corinna Vinschen <corinna@vinschen.de>
* dir.cc (opendir): Fix indentation.
* fhandler_disk_file.cc (fhandler_disk_file::opendir): Move storing
fhandler in file descriptor table to some point very late in function
to avoid double free'ing. Add comment to explain what happens.
Add label free_mounts and don't forget to delete __DIR_mounts structure
if NtOpenFile fails.
2006-03-02 Corinna Vinschen <corinna@vinschen.de> 2006-03-02 Corinna Vinschen <corinna@vinschen.de>
* syscalls.cc (chroot): Disallow chroot into special directories. * syscalls.cc (chroot): Disallow chroot into special directories.

16
winsup/cygwin/fhandler_disk_file.cc
View File

@ -1542,10 +1542,6 @@ fhandler_disk_file::opendir ()
if (fd < 0) if (fd < 0)
goto free_dirent; goto free_dirent;
fd = this;
fd->nohandle (true);
dir->__d_fd = fd;
dir->__fh = this;
/* FindFirstFile doesn't seem to like duplicate /'s. /* FindFirstFile doesn't seem to like duplicate /'s.
The dirname is generated with trailing backslash here which The dirname is generated with trailing backslash here which
simplifies later usage of dirname for checking symlinks. simplifies later usage of dirname for checking symlinks.
@ -1583,7 +1579,7 @@ fhandler_disk_file::opendir ()
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))
{ {
__seterrno_from_nt_status (status); __seterrno_from_nt_status (status);
goto free_dirent; goto free_mounts;
} }
/* FileIdBothDirectoryInformation is apparently unsupported on XP /* FileIdBothDirectoryInformation is apparently unsupported on XP
@ -1602,12 +1598,22 @@ fhandler_disk_file::opendir ()
} }
} }
} }
/* Filling fd with `this' (aka storing this in the file descriptor table
should only happen after it's clear that opendir doesn't fail,
otherwise we end up cfree'ing the fhandler twice, once in opendir()
in dir.cc, the second time on exit. Nasty, nasty... */
fd = this;
fd->nohandle (true);
dir->__d_fd = fd;
dir->__fh = this;
res = dir; res = dir;
} }
syscall_printf ("%p = opendir (%s)", res, get_name ()); syscall_printf ("%p = opendir (%s)", res, get_name ());
return res; return res;
free_mounts:
delete d_mounts (dir);
free_dirent: free_dirent:
free (dir->__d_dirent); free (dir->__d_dirent);
free_dirname: free_dirname: