diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2966ad6e4..fb5eefc73 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-30  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Only write
+	attributes if call to GetFileInformationByHandle was successful.
+
 2005-09-29  Christopher Faylor  <cgf@timesys.com>
 
 	* fork.cc (frok::parent): Simplify error messages.  Don't issue an
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 4682184f1..354873810 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -163,8 +163,8 @@ fhandler_base::fstat_by_handle (struct __stat64 *buf)
       if (local.nFileSizeLow == 0xffffffff && GetLastError ())
 	local.nFileSizeLow = 0;
     }
-
-  pc.set_attributes (local.dwFileAttributes);
+  else
+    pc.set_attributes (local.dwFileAttributes);
   return fstat_helper (buf,
 		       local.ftLastWriteTime, /* see fstat_helper comment */
 		       local.ftLastAccessTime,