diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2014-01-31 19:27:26 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2014-01-31 19:27:26 +0000 |
| commit | 5d9070ba978215876cba3e8e93d9182da416abdf (patch) | |
| tree | 9f21dec5dacfeba21c5c355591063bd8d3818f1c | |
| parent | 63b1a850b3347230b1660f3b3f02f05b8c535cd7 (diff) | |
| download | cygnal-5d9070ba978215876cba3e8e93d9182da416abdf.tar.gz cygnal-5d9070ba978215876cba3e8e93d9182da416abdf.tar.bz2 cygnal-5d9070ba978215876cba3e8e93d9182da416abdf.zip | |
*** empty log message ***
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/dir.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 1ed49672e..4f91ce8c4 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2014-01-30 Corinna Vinschen <corinna@vinschen.de> + + * dir.cc (opendir): Call set_unique_id only with valid fh. + 2014-01-30 Christopher Faylor <me.cygwin2014@cgf.cx> * fhandler.h (cltype): Add cl_buf_beg, cl_buf_end. diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc index dc6e2a740..c1f8a897b 100644 --- a/winsup/cygwin/dir.cc +++ b/winsup/cygwin/dir.cc @@ -1,7 +1,7 @@ /* dir.cc: Posix directory-related routines Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010, 2011, 2012, 2013 Red Hat, Inc. + 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Red Hat, Inc. This file is part of Cygwin. @@ -69,7 +69,7 @@ opendir (const char *name) if (!res && fh) delete fh; /* Applications calling flock(2) on dirfd(fd) need this... */ - if (!fh->nohandle ()) + if (res && !fh->nohandle ()) fh->set_unique_id (); return res; } |