Add options validation code in WaitSetDispatcher::WaitSetAddImpl().

mojo/edk/system/wait_set_dispatcher.cc

 // Copyright 2016 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/edk/system/wait_set_dispatcher.h"
 
 #include "base/logging.h"
 #include "mojo/edk/system/options_validation.h"
 
 using mojo::util::MutexLocker;
@@ skipping 31 matching lines @@
     return MOJO_RESULT_UNIMPLEMENTED;
   out_options->flags = reader.options().flags;
 
   // Checks for fields beyond |flags|:
 
   // (Nothing here yet.)
 
   return MOJO_RESULT_OK;
 }
 
+// static
+MojoResult WaitSetDispatcher::ValidateWaitSetAddOptions(
+    UserPointer<const MojoWaitSetAddOptions> in_options,
+    MojoWaitSetAddOptions* out_options) {
+  const MojoWaitSetAddOptionsFlags kKnownFlags =
+      MOJO_WAIT_SET_ADD_OPTIONS_FLAG_NONE;
+  static const MojoWaitSetAddOptions kDefaultOptions = {
+      static_cast<uint32_t>(sizeof(MojoWaitSetAddOptions)),
+      MOJO_WAIT_SET_ADD_OPTIONS_FLAG_NONE};
+
+  *out_options = kDefaultOptions;
+  if (in_options.IsNull())
+    return MOJO_RESULT_OK;
+
+  UserOptionsReader<MojoWaitSetAddOptions> reader(in_options);
+  if (!reader.is_valid())
+    return MOJO_RESULT_INVALID_ARGUMENT;
+
+  if (!OPTIONS_STRUCT_HAS_MEMBER(MojoWaitSetAddOptions, flags, reader))
+    return MOJO_RESULT_OK;
+  if ((reader.options().flags & ~kKnownFlags))
+    return MOJO_RESULT_UNIMPLEMENTED;
+  out_options->flags = reader.options().flags;
+
+  // Checks for fields beyond |flags|:
+
+  // (Nothing here yet.)
+
+  return MOJO_RESULT_OK;
+}
+
 Dispatcher::Type WaitSetDispatcher::GetType() const {
   return Type::WAIT_SET;
 }
 
 bool WaitSetDispatcher::SupportsEntrypointClass(
     EntrypointClass entrypoint_class) const {
   return (entrypoint_class == EntrypointClass::NONE ||
           entrypoint_class == EntrypointClass::WAIT_SET);
 }
 
@@ skipping 11 matching lines @@
 }
 
 MojoResult WaitSetDispatcher::WaitSetAddImpl(
     UserPointer<const MojoWaitSetAddOptions> options,
     Handle&& handle,
     MojoHandleSignals signals,
     uint64_t cookie) {
   MutexLocker locker(&mutex());
   if (is_closed_no_lock())
     return MOJO_RESULT_INVALID_ARGUMENT;
+  MojoWaitSetAddOptions validated_options;
+  MojoResult result = ValidateWaitSetAddOptions(options, &validated_options);
+  if (result != MOJO_RESULT_OK)
+    return result;
 
   // TODO(vtl)
   NOTIMPLEMENTED();
   return MOJO_RESULT_UNIMPLEMENTED;
 }
 
 MojoResult WaitSetDispatcher::WaitSetRemoveImpl(uint64_t cookie) {
   MutexLocker locker(&mutex());
   if (is_closed_no_lock())
     return MOJO_RESULT_INVALID_ARGUMENT;
@@ skipping 12 matching lines @@
   if (is_closed_no_lock())
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   // TODO(vtl)
   NOTIMPLEMENTED();
   return MOJO_RESULT_UNIMPLEMENTED;
 }
 
 }  // namespace system
 }  // namespace mojo