ipc: Update Message::FindNext to parse brokered attachments.

ipc/ipc_channel_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 "ipc/ipc_channel_reader.h"
 
 #include <algorithm>
 
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_logging.h"
@@ skipping 66 matching lines @@
       input_overflow_buf_.clear();
       LOG(ERROR) << "IPC message is too big";
       return false;
     }
     input_overflow_buf_.append(input_data, input_data_len);
     p = input_overflow_buf_.data();
     end = p + input_overflow_buf_.size();
   }
 
   // Dispatch all complete messages in the data buffer.
+  bool unrecoverable_parsing_error = false;
   while (p < end) {
-    const char* message_tail = Message::FindNext(p, end);
-    if (message_tail) {
-      int len = static_cast<int>(message_tail - p);
+    Message::NextMessageInfo info = Message::FindNext(p, end);
+    if (info.message_found) {
+      int pickle_len = static_cast<int>(info.pickle_end - p);
+      Message translated_message(p, pickle_len);
 
-      Message translated_message(p, len);
+      // TODO(erikchen): Make attachments for info.attachment_ids.
+      // http://crbug.com/493414.
+
       if (!GetNonBrokeredAttachments(&translated_message))
         return false;
 
       // If there are no queued messages, attempt to immediately dispatch the
       // newly translated message.
       if (queued_messages_.empty()) {
         DCHECK(blocked_ids_.empty());
         AttachmentIdSet blocked_ids =
             GetBrokeredAttachments(&translated_message);
 
         if (blocked_ids.empty()) {
           // Dispatch the message and continue the loop.
           DispatchMessage(&translated_message);
-          p = message_tail;
+          p = info.message_end;
           continue;
         }
 
         blocked_ids_.swap(blocked_ids);
         StartObservingAttachmentBroker();
       }
 
       // Make a deep copy of |translated_message| to add to the queue.
       scoped_ptr<Message> m(new Message(translated_message));
       queued_messages_.push_back(m.release());
-      p = message_tail;
+      p = info.message_end;
     } else {
       // Last message is partial.
+      unrecoverable_parsing_error = info.parsing_error;
       break;
     }
   }
 
   // Save any partial data in the overflow buffer.
   input_overflow_buf_.assign(p, end - p);
 
   if (input_overflow_buf_.empty() && !DidEmptyInputBuffers())
     return false;
+  if (unrecoverable_parsing_error)
+    return false;
   return true;
 }
 
 ChannelReader::DispatchState ChannelReader::DispatchMessages() {
   while (!queued_messages_.empty()) {
     if (!blocked_ids_.empty())
       return DISPATCH_WAITING_ON_BROKER;
 
     Message* m = queued_messages_.front();
 
@@ skipping 94 matching lines @@
 }
 
 void ChannelReader::StopObservingAttachmentBroker() {
 #if USE_ATTACHMENT_BROKER
   GetAttachmentBroker()->RemoveObserver(this);
 #endif  // USE_ATTACHMENT_BROKER
 }
 
 }  // namespace internal
 }  // namespace IPC