Switch back to 'int' instead of uint32 and call CancelIo before closing the socket handle.

base/sync_socket_win.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 "base/sync_socket.h"
 
 #include "base/logging.h"
 #include "base/win/scoped_handle.h"
 
 namespace base {
@@ skipping 108 matching lines @@
   COMPILE_ASSERT(sizeof(buffer[0]) == sizeof(char), incorrect_buffer_type);
   DCHECK_LE(length, kMaxMessageLength);
 
   OVERLAPPED ol = {0};
   ol.hEvent = io_event->handle();
   size_t count = 0;
   while (count < length) {
     DWORD chunk = GetNextChunkSize(count, length);
     // This is either the ReadFile or WriteFile call depending on whether
     // we're receiving or sending data.
-    DWORD len;
+    DWORD len = 0;
     BOOL ok = operation(file, static_cast<BufferType*>(buffer) + count, chunk,
                         &len, &ol);
     if (!ok) {
       if (::GetLastError() == ERROR_IO_PENDING) {
         base::WaitableEvent* events[] = { io_event, cancel_event };
         size_t signaled = WaitableEvent::WaitMany(events, arraysize(events));
         if (signaled == 1) {
           VLOG(1) << "Shutdown was signaled. Closing socket.";
+          CancelIo(file);
           socket->Close();
+          count = 0;
           break;
         } else {
           GetOverlappedResult(file, &ol, &len, TRUE);
         }
       } else {
         return (0 < count) ? count : 0;
       }
     }
     count += len;
   }
@@ skipping 95 matching lines @@
 }
 
 // static
 bool CancelableSyncSocket::CreatePair(CancelableSyncSocket* socket_a,
                                       CancelableSyncSocket* socket_b) {
   return CreatePairImpl(&socket_a->handle_, &socket_b->handle_, true);
 }
 
 
 }  // namespace base