From 2bb6b3e50619d10b93a8a2640dd4784e01e97236 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Wed, 5 Jun 2002 15:43:49 +0000 Subject: * dtable.cc (handle_to_fn): Check error return value from NtQueryObject first before seeing if name buffer is NULL. * grp.cc (read_etc_group): Fix gcc warning regarding snprintf format. * passwd.cc (read_etc_passwd): Ditto. --- winsup/cygwin/dtable.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'winsup/cygwin/dtable.cc') diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc index 62c960917..c00420d5d 100644 --- a/winsup/cygwin/dtable.cc +++ b/winsup/cygwin/dtable.cc @@ -734,15 +734,19 @@ handle_to_fn (HANDLE h, char *posix_fn) DWORD res = NtQueryObject (h, ObjectNameInformation, ntfn, sizeof (fnbuf), NULL); - // NT seems to do this on an unopened file - if (!ntfn->Name.Buffer) - return NULL; - if (res) { strcpy (posix_fn, "some disk file"); return posix_fn; } + + // NT seems to do this on an unopened file + if (!ntfn->Name.Buffer) + { + debug_printf ("nt->Name.Buffer == NULL"); + return NULL; + } + ntfn->Name.Buffer[ntfn->Name.Length / sizeof (WCHAR)] = 0; char win32_fn[MAX_PATH + 100]; -- cgit v1.2.3