| Index: mojo/public/cpp/bindings/lib/validation_context.cc
|
| diff --git a/mojo/public/cpp/bindings/lib/validation_context.cc b/mojo/public/cpp/bindings/lib/validation_context.cc
|
| index a95e07ef8151d497107e5e3908f060c63dcf1793..ef07aec9bb445054edad0b1397b2bcd175747a9d 100644
|
| --- a/mojo/public/cpp/bindings/lib/validation_context.cc
|
| +++ b/mojo/public/cpp/bindings/lib/validation_context.cc
|
| @@ -4,13 +4,7 @@
|
|
|
| #include "mojo/public/cpp/bindings/lib/validation_context.h"
|
|
|
| -#include <stddef.h>
|
| -#include <stdint.h>
|
| -
|
| #include "base/logging.h"
|
| -#include "mojo/public/cpp/bindings/lib/serialization_util.h"
|
| -#include "mojo/public/cpp/bindings/message.h"
|
| -#include "mojo/public/cpp/system/handle.h"
|
|
|
| namespace mojo {
|
| namespace internal {
|
| @@ -44,43 +38,5 @@ ValidationContext::ValidationContext(const void* data,
|
| ValidationContext::~ValidationContext() {
|
| }
|
|
|
| -bool ValidationContext::ClaimMemory(const void* position, uint32_t num_bytes) {
|
| - uintptr_t begin = reinterpret_cast<uintptr_t>(position);
|
| - uintptr_t end = begin + num_bytes;
|
| -
|
| - if (!InternalIsValidRange(begin, end))
|
| - return false;
|
| -
|
| - data_begin_ = end;
|
| - return true;
|
| -}
|
| -
|
| -bool ValidationContext::ClaimHandle(const Handle_Data& encoded_handle) {
|
| - uint32_t index = encoded_handle.value;
|
| - if (index == kEncodedInvalidHandleValue)
|
| - return true;
|
| -
|
| - if (index < handle_begin_ || index >= handle_end_)
|
| - return false;
|
| -
|
| - // |index| + 1 shouldn't overflow, because |index| is not the max value of
|
| - // uint32_t (it is less than |handle_end_|).
|
| - handle_begin_ = index + 1;
|
| - return true;
|
| -}
|
| -
|
| -bool ValidationContext::IsValidRange(const void* position,
|
| - uint32_t num_bytes) const {
|
| - uintptr_t begin = reinterpret_cast<uintptr_t>(position);
|
| - uintptr_t end = begin + num_bytes;
|
| -
|
| - return InternalIsValidRange(begin, end);
|
| -}
|
| -
|
| -bool ValidationContext::InternalIsValidRange(uintptr_t begin,
|
| - uintptr_t end) const {
|
| - return end > begin && begin >= data_begin_ && end <= data_end_;
|
| -}
|
| -
|
| } // namespace internal
|
| } // namespace mojo
|
|
|