Throw YAML::Exception during conversion if the data type mismatches. (#2262) (#2304)

* throw YAML::Exception during conversion if the data type mismatches.



* fix build failure for dependent packages.



* explicitly handle the decoder exception.



---------



(cherry picked from commit 2f89eec)

Signed-off-by: Tomoya.Fujita <tomoya.fujita825@gmail.com>
Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

Author: mergify[bot]

rosbag2_storage/include/rosbag2_storage/yaml.hpp

@@ -42,7 +42,18 @@ template<typename T>
 void optional_assign(const Node & node, std::string field, T & assign_to)
 {
   if (node[field]) {
-    YAML::convert<T>::decode(node[field], assign_to);
+    bool converted = false;
+    try {
+      converted = YAML::convert<T>::decode(node[field], assign_to);
+    } catch (const YAML::Exception & ex) {
+      // Preserve original error but add field name context
+      throw YAML::Exception(
+        node[field].Mark(),
+        "Failed to convert field '" + field + "': " + ex.what());
+    }
+    if (!converted) {
+      throw YAML::Exception(node[field].Mark(), "Failed to convert field '" + field + "'");
+    }
   }
 }
 

rosbag2_storage/test/rosbag2_storage/test_storage_options.cpp

@@ -54,3 +54,19 @@ TEST(storage_options, test_yaml_serialization)
   ASSERT_EQ(original.end_time_ns, reconstructed.end_time_ns);
   ASSERT_EQ(original.custom_data, reconstructed.custom_data);
 }
+
+TEST(storage_options, test_invalid_numeric_value)
+{
+  YAML::Node node;
+  node["uri"] = "some_uri";
+  node["storage_id"] = "some_identification";
+  node["max_bagfile_size"] = "non_numeric_value";
+  try {
+    node.as<rosbag2_storage::StorageOptions>();
+    FAIL() << "Expected YAML::Exception to be thrown";
+  } catch (const YAML::Exception & ex) {
+    std::string error_msg = ex.what();
+    EXPECT_THAT(error_msg, HasSubstr("max_bagfile_size"));
+    EXPECT_THAT(error_msg, HasSubstr("Failed to convert field"));
+  }
+}