diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2b5b4e5cc..9b9a03792 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-30  Christopher Faylor  <cgf@redhat.com>
+
+	* fhandler_registry.cc (fhandler_registry::exists): Fix off-by-one
+	error when inspecting path.
+
 2003-01-29  Christopher Faylor  <cgf@redhat.com>
 
 	* lib/getopt.c: Allow environment variable control of POSIXLY_INCORRECT
diff --git a/winsup/cygwin/fhandler_registry.cc b/winsup/cygwin/fhandler_registry.cc
index 18e1db4dd..2d6aeb899 100644
--- a/winsup/cygwin/fhandler_registry.cc
+++ b/winsup/cygwin/fhandler_registry.cc
@@ -106,8 +106,10 @@ fhandler_registry::exists ()
 
   const char *path = get_name ();
   debug_printf ("exists (%s)", path);
-  path += proc_len + registry_len + 2;
-  if (*path == 0)
+  path += proc_len + registry_len + 1;
+  if (*path)
+    path++;
+  else
     {
       file_type = 2;
       goto out;