mojo::Serialize*_() calls now propogate/return validation errors.

mojo/public/cpp/bindings/lib/map_serialization.h

 // 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.
 
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_
 
 #include "mojo/public/cpp/bindings/lib/array_internal.h"
 #include "mojo/public/cpp/bindings/lib/array_serialization.h"
 #include "mojo/public/cpp/bindings/lib/bindings_internal.h"
@@ skipping 103 matching lines @@
         internal::MapSerializer<MapKey, DataKey>::GetItemSize(it.GetKey());
     value_data_size +=
         internal::MapSerializer<MapValue, DataValue>::GetItemSize(
             it.GetValue());
   }
 
   return struct_overhead + key_base_size + key_data_size + value_base_size +
          value_data_size;
 }
 
+// SerializeMap_ will return VALIDATION_ERROR_NONE on success and sets

[viettrungluu, 2015/10/09 01:35:19]

"sets" -> "set"

[vardhan, 2015/10/09 22:31:28]

Done.

+// |output| accordingly.  On failure, |input| will be partially serialized into
+// |output| up until an error occurs (which is propagated up and returned by
+// SerializeMap_), in which case |buf| is also partially consumed.
+//
 // We don't need an ArrayValidateParams instance for key validation since
 // we can deduce it from the Key type. (which can only be primitive types or
 // non-nullable strings.)
 template <typename MapKey,
           typename MapValue,
           typename DataKey,
           typename DataValue>
-inline void SerializeMap_(
+inline internal::ValidationError SerializeMap_(
     Map<MapKey, MapValue>* input,
     internal::Buffer* buf,
     internal::Map_Data<DataKey, DataValue>** output,
     const internal::ArrayValidateParams* value_validate_params) {
-  if (input && *input) {
-    internal::Map_Data<DataKey, DataValue>* result =
-        internal::Map_Data<DataKey, DataValue>::New(buf);
-    internal::Array_Data<DataKey>* keys_data =
-        internal::Array_Data<DataKey>::New(input->size(), buf);
+  if (input->is_null()) {
+    // |input| could be a nullable map, in which case |output| is serialized as
+    // null, which is valid.
+    *output = nullptr;
+    return internal::VALIDATION_ERROR_NONE;
+  }
 
-    if (result && keys_data) {
-      result->keys.ptr = keys_data;
+  internal::Map_Data<DataKey, DataValue>* result =
+      internal::Map_Data<DataKey, DataValue>::New(buf);
 
-      // We *must* serialize the keys before we allocate an Array_Data for the
-      // values.
-      internal::MapKeyIterator<MapKey, MapValue> key_iter(input);
-      const internal::ArrayValidateParams* key_validate_params =
-          internal::MapKeyValidateParamsFactory<DataKey>::Get();
+  // We *must* serialize the keys before we allocate an Array_Data for the
+  // values.
+  internal::Array_Data<DataKey>* keys_data =
+      internal::Array_Data<DataKey>::New(input->size(), buf);
+  result->keys.ptr = keys_data;
 
+  internal::MapKeyIterator<MapKey, MapValue> key_iter(input);
+  const internal::ArrayValidateParams* key_validate_params =
+      internal::MapKeyValidateParamsFactory<DataKey>::Get();
+
+  auto keys_retval =
       internal::ArraySerializer<MapKey, DataKey>::SerializeElements(
           key_iter.begin(), input->size(), buf, result->keys.ptr,
           key_validate_params);
+  if (keys_retval != internal::VALIDATION_ERROR_NONE)
+    return keys_retval;
 
-      // Now we try allocate an Array_Data for the values
-      internal::Array_Data<DataValue>* values_data =
-          internal::Array_Data<DataValue>::New(input->size(), buf);
-      if (values_data) {
-        result->values.ptr = values_data;
-        internal::MapValueIterator<MapKey, MapValue> value_iter(input);
-        internal::ArraySerializer<MapValue, DataValue>::SerializeElements(
-            value_iter.begin(), input->size(), buf, result->values.ptr,
-            value_validate_params);
-      }
-    }
-    *output = result;
-  } else {
-    *output = nullptr;
-  }
+  // Now we try allocate an Array_Data for the values
+  internal::Array_Data<DataValue>* values_data =
+      internal::Array_Data<DataValue>::New(input->size(), buf);
+  result->values.ptr = values_data;
+
+  internal::MapValueIterator<MapKey, MapValue> value_iter(input);
+
+  auto values_retval =
+      internal::ArraySerializer<MapValue, DataValue>::SerializeElements(
+          value_iter.begin(), input->size(), buf, result->values.ptr,
+          value_validate_params);
+

[viettrungluu, 2015/10/09 01:35:19]

nit: delete this blank line

[vardhan, 2015/10/09 22:31:28]

Done.

+  if (values_retval != internal::VALIDATION_ERROR_NONE)
+    return values_retval;
+
+  *output = result;
+  return internal::VALIDATION_ERROR_NONE;
 }
 
 template <typename MapKey,
           typename MapValue,
           typename DataKey,
           typename DataValue>
 inline void Deserialize_(internal::Map_Data<DataKey, DataValue>* input,
                          Map<MapKey, MapValue>* output) {
   if (input) {
     Array<MapKey> keys;
     Array<MapValue> values;
 
     Deserialize_(input->keys.ptr, &keys);
     Deserialize_(input->values.ptr, &values);
 
     *output = Map<MapKey, MapValue>(keys.Pass(), values.Pass());
   } else {
     output->reset();
   }
 }
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_