Index: mojo/public/cpp/bindings/lib/map_serialization.h |
diff --git a/mojo/public/cpp/bindings/lib/map_serialization.h b/mojo/public/cpp/bindings/lib/map_serialization.h |
index 6874fbe5aeda80318f07eca8280157804930823a..01802207f3b014377b399bc0582a3add5ac1aec2 100644 |
--- a/mojo/public/cpp/bindings/lib/map_serialization.h |
+++ b/mojo/public/cpp/bindings/lib/map_serialization.h |
@@ -162,20 +162,23 @@ template <typename MapKey, |
typename MapValue, |
typename DataKey, |
typename DataValue> |
-inline void Deserialize_(internal::Map_Data<DataKey, DataValue>* input, |
+inline bool Deserialize_(internal::Map_Data<DataKey, DataValue>* input, |
Map<MapKey, MapValue>* output, |
internal::SerializationContext* context) { |
if (input) { |
Array<MapKey> keys; |
Array<MapValue> values; |
- Deserialize_(input->keys.ptr, &keys, context); |
- Deserialize_(input->values.ptr, &values, context); |
+ if (!Deserialize_(input->keys.ptr, &keys, context)) |
+ return false; |
+ if (!Deserialize_(input->values.ptr, &values, context)) |
+ return false; |
*output = Map<MapKey, MapValue>(keys.Pass(), values.Pass()); |
} else { |
output->reset(); |
} |
+ return true; |
} |
} // namespace mojo |