Add error checking of object deserialization; ignore non-object initi…

…alizationOptions

src/messages/initialize.cc

@@ -215,8 +215,8 @@ void Reflect(JsonReader &reader, InitializeParam::Trace &value) {
     value = InitializeParam::Trace::Verbose;
 }
 
-REFLECT_STRUCT(InitializeParam, rootUri, initializationOptions, capabilities,
-               trace, workspaceFolders);
+// initializationOptions is deserialized separately.
+REFLECT_STRUCT(InitializeParam, rootUri, capabilities, trace, workspaceFolders);
 
 struct InitializeResult {
   ServerCap capabilities;
@@ -384,6 +384,17 @@ void Initialize(MessageHandler *m, InitializeParam &param, ReplyOnce &reply) {
 void MessageHandler::initialize(JsonReader &reader, ReplyOnce &reply) {
   InitializeParam param;
   Reflect(reader, param);
+  auto it = reader.m->FindMember("initializationOptions");
+  if (it != reader.m->MemberEnd() && it->value.IsObject()) {
+    JsonReader m1(&it->value);
+    try {
+      Reflect(m1, param.initializationOptions);
+    } catch (std::invalid_argument &) {
+      reader.path_.push_back("initializationOptions");
+      reader.path_.insert(reader.path_.end(), m1.path_.begin(), m1.path_.end());
+      throw;
+    }
+  }
   if (!param.rootUri) {
     reply.Error(ErrorCode::InvalidRequest, "expected rootUri");
     return;

src/serializer.cc

@@ -397,6 +397,11 @@ void Reflect(JsonWriter &vis, SerializeFormat &v) {
   }
 }
 
+void ReflectMemberStart(JsonReader &vis) {
+  if (!vis.m->IsObject())
+    throw std::invalid_argument("object");
+}
+
 static BumpPtrAllocator Alloc;
 static DenseSet<CachedHashStringRef> Strings;
 static std::mutex AllocMutex;

src/serializer.hh

@@ -367,6 +367,7 @@ template <typename T> void Reflect(BinaryWriter &vis, std::vector<T> &v) {
 
 // ReflectMember
 
+void ReflectMemberStart(JsonReader &);
 template <typename T> void ReflectMemberStart(T &) {}
 inline void ReflectMemberStart(JsonWriter &vis) { vis.StartObject(); }