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

mojo/system/mapping_table.cc

 // Copyright 2014 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/mapping_table.h"
 
 #include "base/logging.h"
 #include "mojo/system/constants.h"
 #include "mojo/system/raw_shared_buffer.h"
 
@@ skipping 15 matching lines @@
   if (address_to_mapping_map_.size() >= kMaxMappingTableSize)
     return MOJO_RESULT_RESOURCE_EXHAUSTED;
 
   uintptr_t address = reinterpret_cast<uintptr_t>(mapping->base());
   DCHECK(address_to_mapping_map_.find(address) ==
              address_to_mapping_map_.end());
   address_to_mapping_map_[address] = mapping.release();
   return MOJO_RESULT_OK;
 }
 
-MojoResult MappingTable::RemoveMapping(void* address) {
-  AddressToMappingMap::iterator it =
-      address_to_mapping_map_.find(reinterpret_cast<uintptr_t>(address));
+MojoResult MappingTable::RemoveMapping(uintptr_t address) {
+  AddressToMappingMap::iterator it = address_to_mapping_map_.find(address);
   if (it == address_to_mapping_map_.end())
     return MOJO_RESULT_INVALID_ARGUMENT;
   RawSharedBufferMapping* mapping_to_delete = it->second;
   address_to_mapping_map_.erase(it);
   delete mapping_to_delete;
   return MOJO_RESULT_OK;
 }
 
 }  // namespace system
 }  // namespace mojo