Fixed StreamListenSocket::OnObjectSignaled case when both FD_CLOSE and FD_READ are set.

net/socket/stream_listen_socket.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/stream_listen_socket.h"
 
 #if defined(OS_WIN)
 // winsock2.h must be included first in order to ensure it is included before
 // windows.h.
 #include <winsock2.h>
@@ skipping 234 matching lines @@
 // TODO(ibrar): We can add these functions into OS dependent files.
 #if defined(OS_WIN)
 // MessageLoop watcher callback.
 void StreamListenSocket::OnObjectSignaled(HANDLE object) {
   WSANETWORKEVENTS ev;
   if (kSocketError == WSAEnumNetworkEvents(socket_, socket_event_, &ev)) {
     // TODO
     return;
   }
 
-  if (!(ev.lNetworkEvents & FD_CLOSE)) {
-    // The object was reset by WSAEnumNetworkEvents.  Watch for the next signal.
-    watcher_.StartWatching(object, this);
+  // If both FD_CLOSE and FD_READ are set we only call Read().
+  // This will cause OnObjectSignaled to be called immediately again
+  // unless this socket is destroyed in Read().
+  if ((ev.lNetworkEvents & (FD_CLOSE | FD_READ)) == FD_CLOSE) {
+    Close();
+    // Close might have deleted this object. We should return immediately.
+    return;
   }
-
+  // The object was reset by WSAEnumNetworkEvents.  Watch for the next signal.
+  watcher_.StartWatching(object, this);
 
   if (ev.lNetworkEvents == 0) {
     // Occasionally the event is set even though there is no new data.
     // The net seems to think that this is ignorable.
     return;
   }
   if (ev.lNetworkEvents & FD_ACCEPT) {
     Accept();
   }
   if (ev.lNetworkEvents & FD_READ) {
     if (reads_paused_) {
       has_pending_reads_ = true;
     } else {
       Read();
-      // Read doesn't call Close() in Windows case. We keep going.
+      // Read might have deleted this object. We should return immediately.
     }
   }
-  if (ev.lNetworkEvents & FD_CLOSE) {
-    Close();
-    // Close might have deleted this object. We should return immediately.
-    return;
-  }
 }
 #elif defined(OS_POSIX)
 void StreamListenSocket::OnFileCanReadWithoutBlocking(int fd) {
   switch (wait_state_) {
     case WAITING_ACCEPT:
       Accept();
       break;
     case WAITING_READ:
       if (reads_paused_) {
         has_pending_reads_ = true;
@@ skipping 24 matching lines @@
 void StreamListenSocket::ResumeReads() {
   DCHECK(reads_paused_);
   reads_paused_ = false;
   if (has_pending_reads_) {
     has_pending_reads_ = false;
     Read();
   }
 }
 
 }  // namespace net