Protect against an invalid JSON batch table.

Unfortunately, rapidjson doesn't really have a valid empty document object.
timoore · Feb 2, 2023 · 6fbffd2 · 6fbffd2
1 parent a0959d1
commit 6fbffd2
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 52 deletions.
diff --git a/Cesium3DTilesSelection/src/BatchTableToGltfFeatureMetadata.cpp b/Cesium3DTilesSelection/src/BatchTableToGltfFeatureMetadata.cpp
@@ -1408,61 +1408,63 @@ void convertBatchTableToGltfFeatureMetadataExtension(
   featureTable.count = featureCount;
   featureTable.classProperty = "default";
 
-  // Convert each regular property in the batch table
-  for (auto propertyIt = batchTableJson.MemberBegin();
-       propertyIt != batchTableJson.MemberEnd();
-       ++propertyIt) {
-    std::string name = propertyIt->name.GetString();
-
-    // Don't interpret extensions or extras as a property.
-    if (name == "extensions" || name == "extras") {
-      continue;
-    }
+  if (batchTableJson.IsObject()) {
+    // Convert each regular property in the batch table
+    for (auto propertyIt = batchTableJson.MemberBegin();
+         propertyIt != batchTableJson.MemberEnd();
+         ++propertyIt) {
+      std::string name = propertyIt->name.GetString();
 
-    ClassProperty& classProperty =
-        classDefinition.properties.emplace(name, ClassProperty()).first->second;
-    classProperty.name = name;
+      // Don't interpret extensions or extras as a property.
+      if (name == "extensions" || name == "extras") {
+        continue;
+      }
 
-    FeatureTableProperty& featureTableProperty =
-        featureTable.properties.emplace(name, FeatureTableProperty())
-            .first->second;
-    const rapidjson::Value& propertyValue = propertyIt->value;
-    if (propertyValue.IsArray()) {
-      updateExtensionWithJsonProperty(
-          gltf,
-          classProperty,
-          featureTable,
-          featureTableProperty,
-          ArrayOfPropertyValues(propertyValue));
-    } else {
-      BinaryProperty& binaryProperty = binaryProperties.emplace_back();
-      updateExtensionWithBinaryProperty(
-          gltf,
-          gltfBufferIndex,
-          gltfBufferOffset,
-          binaryProperty,
-          classProperty,
-          featureTableProperty,
-          result,
-          featureTable,
-          name,
-          propertyValue);
-      gltfBufferOffset += roundUp(binaryProperty.byteLength, 8);
+      ClassProperty& classProperty =
+          classDefinition.properties.emplace(name, ClassProperty()).first->second;
+      classProperty.name = name;
+
+      FeatureTableProperty& featureTableProperty =
+          featureTable.properties.emplace(name, FeatureTableProperty())
+          .first->second;
+      const rapidjson::Value& propertyValue = propertyIt->value;
+      if (propertyValue.IsArray()) {
+        updateExtensionWithJsonProperty(
+            gltf,
+            classProperty,
+            featureTable,
+            featureTableProperty,
+            ArrayOfPropertyValues(propertyValue));
+      } else {
+        BinaryProperty& binaryProperty = binaryProperties.emplace_back();
+        updateExtensionWithBinaryProperty(
+            gltf,
+            gltfBufferIndex,
+            gltfBufferOffset,
+            binaryProperty,
+            classProperty,
+            featureTableProperty,
+            result,
+            featureTable,
+            name,
+            propertyValue);
+        gltfBufferOffset += roundUp(binaryProperty.byteLength, 8);
+      }
     }
-  }
 
-  // Convert 3DTILES_batch_table_hierarchy
-  auto extensionsIt = batchTableJson.FindMember("extensions");
-  if (extensionsIt != batchTableJson.MemberEnd()) {
-    auto bthIt =
-        extensionsIt->value.FindMember("3DTILES_batch_table_hierarchy");
-    if (bthIt != extensionsIt->value.MemberEnd()) {
-      updateExtensionWithBatchTableHierarchy(
-          gltf,
-          classDefinition,
-          featureTable,
-          result,
-          bthIt->value);
+    // Convert 3DTILES_batch_table_hierarchy
+    auto extensionsIt = batchTableJson.FindMember("extensions");
+    if (extensionsIt != batchTableJson.MemberEnd()) {
+      auto bthIt =
+          extensionsIt->value.FindMember("3DTILES_batch_table_hierarchy");
+      if (bthIt != extensionsIt->value.MemberEnd()) {
+        updateExtensionWithBatchTableHierarchy(
+            gltf,
+            classDefinition,
+            featureTable,
+            result,
+            bthIt->value);
+      }
     }
   }
 

diff --git a/Cesium3DTilesSelection/src/PntsToGltfConverter.cpp b/Cesium3DTilesSelection/src/PntsToGltfConverter.cpp
@@ -1539,7 +1539,7 @@ void convertPntsContentToGltf(
 
     createGltfFromParsedContent(parsedContent, result);
 
-    if (batchTableJson.HasParseError() || batchTableJson.MemberCount() == 0 ||
+    if (batchTableJson.HasParseError() ||
         parsedContent.dracoMetadataHasErrors) {
       result.errors.merge(parsedContent.errors);
       return;