Mojo: Change how we handle invalid pointer arguments (at the system layer).

mojo/system/core_test_base.cc

 // Copyright 2013 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 "mojo/system/core_test_base.h"
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 50 matching lines @@
 
     if (transports)
       return MOJO_RESULT_UNIMPLEMENTED;
 
     return MOJO_RESULT_OK;
   }
 
   virtual MojoResult ReadMessageImplNoLock(
       void* bytes,
       uint32_t* num_bytes,
-      DispatcherVector* /*dispatchers*/,
-      uint32_t* /*num_dispatchers*/,
+      DispatcherVector* dispatchers,
+      uint32_t* num_dispatchers,
       MojoReadMessageFlags /*flags*/) OVERRIDE {
     info_->IncrementReadMessageCallCount();
     lock().AssertAcquired();
 
     if (num_bytes && !VerifyUserPointerWithSize<1>(bytes, *num_bytes))
       return MOJO_RESULT_INVALID_ARGUMENT;
 
+    if (num_dispatchers) {
+      *num_dispatchers = 1;
+      if (dispatchers) {
+        // Okay to leave an invalid dispatcher.
+        dispatchers->resize(1);
+      }
+    }
+
     return MOJO_RESULT_OK;
   }
 
   virtual MojoResult WriteDataImplNoLock(
       const void* /*elements*/,
       uint32_t* /*num_bytes*/,
       MojoWriteDataFlags /*flags*/) OVERRIDE {
     info_->IncrementWriteDataCallCount();
     lock().AssertAcquired();
     return MOJO_RESULT_UNIMPLEMENTED;
@@ skipping 250 matching lines @@
 }
 
 void CoreTestBase_MockHandleInfo::IncrementCancelAllWaitersCallCount() {
   base::AutoLock locker(lock_);
   cancel_all_waiters_call_count_++;
 }
 
 }  // namespace test
 }  // namespace system
 }  // namespace mojo