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

* fhandler_procsys.cc (fhandler_procsys::opendir): Avoid SEGV if

Browse Source 
opening object directory fails.
	* fhandler_virtual.cc (fhandler_virtual::opendir): Don't leak memory.
This commit is contained in:
Corinna Vinschen
2011-02-15 14:44:11 +00:00
parent c48947b454
commit fe222f2210
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
winsup/cygwin/fhandler_procsys.cc
View File

@ -1,6 +1,6 @@
/* fhandler_procsys.cc: fhandler for native NT namespace.
Copyright 2010 Red Hat, Inc.
Copyright 2010, 2011 Red Hat, Inc.
This file is part of Cygwin.
@ -245,18 +245,20 @@ fhandler_procsys::opendir (int fd)
OBJECT_ATTRIBUTES attr;
NTSTATUS status;
HANDLE h;
DIR *dir = fhandler_virtual::opendir (fd);
DIR *dir;
mk_unicode_path (&path);
InitializeObjectAttributes (&attr, &path, OBJ_CASE_INSENSITIVE, NULL, NULL);
status = NtOpenDirectoryObject (&h, DIRECTORY_QUERY, &attr);
if (!NT_SUCCESS (status))
{
free (dir);
__seterrno_from_nt_status (status);
return NULL;
}
dir->__handle = h;
if (!(dir = fhandler_virtual::opendir (fd)))
NtClose (h);
else
dir->__handle = h;
return dir;
}