diff options
| author | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 05:41:17 +0000 |
|---|---|---|
| committer | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 05:41:17 +0000 |
| commit | 8cd4f841f8484d51e11af432c26a3a3758dfea6c (patch) | |
| tree | 83ff80b65a62aece28aac08ef04ec22b07915a71 /mojo | |
| parent | 843ad95a895781073bd9168c44068ed46b2f9d8d (diff) | |
| download | chromium_src-8cd4f841f8484d51e11af432c26a3a3758dfea6c.zip chromium_src-8cd4f841f8484d51e11af432c26a3a3758dfea6c.tar.gz chromium_src-8cd4f841f8484d51e11af432c26a3a3758dfea6c.tar.bz2 | |
More clear comment for ValidateStructHeader.
BUG=None
TEST=None
R=viettrungluu@chromium.org
Review URL: https://codereview.chromium.org/328183002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276546 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/public/cpp/bindings/lib/bindings_serialization.cc | 2 | ||||
| -rw-r--r-- | mojo/public/cpp/bindings/lib/bindings_serialization.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mojo/public/cpp/bindings/lib/bindings_serialization.cc b/mojo/public/cpp/bindings/lib/bindings_serialization.cc index d341b21..d5f7785 100644 --- a/mojo/public/cpp/bindings/lib/bindings_serialization.cc +++ b/mojo/public/cpp/bindings/lib/bindings_serialization.cc @@ -84,6 +84,8 @@ bool ValidateStructHeader(const void* data, uint32_t min_num_bytes, uint32_t min_num_fields, BoundsChecker* bounds_checker) { + assert(min_num_bytes >= sizeof(StructHeader)); + if (!IsAligned(data)) { ReportValidationError(VALIDATION_ERROR_MISALIGNED_OBJECT); return false; diff --git a/mojo/public/cpp/bindings/lib/bindings_serialization.h b/mojo/public/cpp/bindings/lib/bindings_serialization.h index 9cd2f13..6bebf90 100644 --- a/mojo/public/cpp/bindings/lib/bindings_serialization.h +++ b/mojo/public/cpp/bindings/lib/bindings_serialization.h @@ -71,6 +71,7 @@ inline void Decode(T* obj, std::vector<Handle>* handles) { // If returns true, this function also claims the memory range of the size // specified in the struct header, starting from |data|. +// Note: |min_num_bytes| must be no less than sizeof(StructHeader). bool ValidateStructHeader(const void* data, uint32_t min_num_bytes, uint32_t min_num_fields, |