Fix potential missed error in Metadata::to_configuration

LDeakin · Jan 25, 2024 · 1d2dac2 · 1d2dac2
1 parent f642208
commit 1d2dac2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -53,6 +53,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - `FillValue::equals_all` incorrect behaviour with a `FillValue` with size not equal to 1, 2, 4, 8, or 16 bytes.
  - Fix `NodePath` display output
  - Fix handling of non-standard `NaN` values for `f16` and `bf16`
+ - Fix potential missed error in `Metadata::to_configuration`
 
 ## [0.10.0] - 2024-01-17
 

diff --git a/src/metadata.rs b/src/metadata.rs
@@ -157,16 +157,22 @@ impl Metadata {
                 ))
             },
             |configuration| {
-                serde_json::from_value(serde_json::to_value(configuration).unwrap_or_default())
-                    .map_or_else(
+                let value = serde_json::to_value(configuration);
+                match value {
+                    Ok(value) => serde_json::from_value(value).map_or_else(
                         |_| {
                             Err(ConfigurationInvalidError::new(
                                 &self.name,
                                 self.configuration.clone(),
                             ))
                         },
                         |configuration| Ok(configuration),
-                    )
+                    ),
+                    Err(_) => Err(ConfigurationInvalidError::new(
+                        &self.name,
+                        self.configuration.clone(),
+                    )),
+                }
             },
         )
     }