Fix MessageReader to handle errors properly.

remoting/protocol/message_reader.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 "remoting/protocol/message_reader.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 48 matching lines @@
     DoRead();
   }
 }
 
 void MessageReader::HandleReadResult(int result) {
   if (closed_)
     return;
 
   if (result > 0) {
     OnDataReceived(read_buffer_, result);
+  } else if (result == net::ERR_IO_PENDING) {
+    read_pending_ = true;
   } else {
-    if (result == net::ERR_CONNECTION_CLOSED) {
-      closed_ = true;
-    } else if (result == net::ERR_IO_PENDING) {
-      read_pending_ = true;
-    } else {
+    if (result != net::ERR_CONNECTION_CLOSED) {
       LOG(ERROR) << "Read() returned error " << result;
     }
+    // Stop reading after an error.

[Wez, 2012/07/14 00:58:34]

nit: an -> any

[Sergey Ulanov, 2012/07/14 01:17:22]

Done.

+    closed_ = true;
   }
 }
 
 void MessageReader::OnDataReceived(net::IOBuffer* data, int data_size) {
   message_decoder_.AddData(data, data_size);
 
   // Get list of all new messages first, and then call the callback
   // for all of them.
   std::vector<CompoundBuffer*> new_messages;
   while (true) {
@@ skipping 21 matching lines @@
   } else {
     task_runner->PostTask(
         FROM_HERE, base::Bind(&MessageReader::ProcessDoneEvent, this));
   }
 }
 
 void MessageReader::ProcessDoneEvent() {
   pending_messages_--;
   DCHECK_GE(pending_messages_, 0);
 
+  if (!read_pending_)
   DoRead(); // Start next read if neccessary.

[Wez, 2012/07/14 00:58:34]

Indentation.

[Sergey Ulanov, 2012/07/14 01:17:22]

Done.

 }
 
 }  // namespace protocol
 }  // namespace remoting