diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 8068c0735..5a6a8c2fc 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-24  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* path.cc (symlink_info::check_shortcut): Ensure that symlink handle is
+	closed on successful return.
+
 2008-12-23  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* fhandler.h (fhandler_base_setup_overlapped): Add new argument.
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 3b726c09a..5cacaba3b 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -1902,11 +1902,10 @@ symlink_info::check_shortcut (HANDLE in_h)
     }
   if (res) /* It's a symlink.  */
     pflags = PATH_SYMLINK | PATH_LNK;
-  return res;
 
 out:
   NtClose (h);
-  return 0;
+  return res;
 }
 
 int