summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/fhandler.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 49a50cf34..cdfa3fc50 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-16 Christopher Faylor <me.cygwin2011@cgf.cx>
+
+ * fhandler.cc (fhandler_base_overlapped::wait_overlapped): Fix
+ unresolved access of wores in successful situations.
+
2011-12-16 Corinna Vinschen <vinschen@redhat.com>
* Makefile.in (DLL_OFILES): Add wow64.o.
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index b6c719ccd..5fd416ce2 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -1939,7 +1939,7 @@ fhandler_base_overlapped::wait_overlapped (bool inres, bool writing, DWORD *byte
overridden by the return of GetOverlappedResult which could detect
that I/O completion occurred. */
CancelIo (h);
- BOOL wores = GetOverlappedResult (h, get_overlapped (), bytes, false);
+ wores = GetOverlappedResult (h, get_overlapped (), bytes, false);
err = GetLastError ();
ResetEvent (get_overlapped ()->hEvent); /* Probably not needed but CYA */
debug_printf ("wfres %d, wores %d, bytes %u", wfres, wores, *bytes);