diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c9ae24341..d07cf257a 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-04  Christopher Faylor  <cgf@redhat.com>
+
+	* dtable.cc (handle_to_fn): Correct placement and length of name
+	buffer. (Suggested by Pavel Tsekov)
+
 2002-06-04  Christopher Faylor  <cgf@redhat.com>
 
 	Remove fcntl.h includes throughout.
diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
index 6c532bc12..e2821db4b 100644
--- a/winsup/cygwin/dtable.cc
+++ b/winsup/cygwin/dtable.cc
@@ -726,8 +726,8 @@ handle_to_fn (HANDLE h, char *posix_fn)
 
   memset (fnbuf, 0, sizeof (fnbuf));
   ntfn = (OBJECT_NAME_INFORMATION *) fnbuf;
-  ntfn->Name.MaximumLength = sizeof (fnbuf);
-  ntfn->Name.Buffer = (WCHAR *) ntfn + 1;
+  ntfn->Name.MaximumLength = sizeof (fnbuf) - sizeof (*ntfn);
+  ntfn->Name.Buffer = (WCHAR *) (ntfn + 1);
 
   DWORD res = NtQueryObject (h, ObjectNameInformation, ntfn, sizeof (fnbuf), NULL);