fixed null stack overflow

intbio-ncl · Nov 6, 2024 · 439e4a4 · 439e4a4
1 parent 8babe6e
commit 439e4a4
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -429,7 +429,7 @@ fn add_dynamic_entity() -> Option<HashMap<String, DynamicEntity>> {
             let bvalue = parse_bool(value);
             match bvalue {
                 Ok(value) => {
-                    dynamic_entity.insert(key, DynamicEntity::EntityBool(value));
+                    dynamic_entity.insert(key, DynamicEntity::EntityBool(Some(value)));
                 }
                 Err(e) => println!("An error occurred: {}", e),
             }

diff --git a/python/Cargo.lock b/python/Cargo.lock
diff --git a/python/example/example.zip b/python/example/example.zip
diff --git a/python/src/utils.rs b/python/src/utils.rs
@@ -192,7 +192,12 @@ pub fn convert_dynamic_entity_to_pyobject(py: Python, value: &DynamicEntity) ->
             );
             py_list.into()
         }
-        DynamicEntity::EntityBool(b) => PyBool::new_bound(py, *b).into_py(py),
+        DynamicEntity::EntityBool(b) => {
+            match b {
+                Some(value) => PyBool::new_bound(py, *value).into_py(py), // If it's a bool, convert it
+                None => py.None().into_py(py), // If it's None, keep it as None in Python
+            }
+        }
         DynamicEntity::Entityi64(num) => (*num).into_py(py),
         DynamicEntity::Entityf64(num) => PyFloat::new_bound(py, *num).into(),
         DynamicEntity::EntityVeci64(vec) => {
@@ -595,7 +600,7 @@ fn convert_pyobject_to_dynamic_entity(py: Python, obj: &PyAny) -> PyResult<Dynam
     }
     // Boolean
     if let Ok(b) = obj.extract::<bool>() {
-        return Ok(DynamicEntity::EntityBool(b));
+        return Ok(DynamicEntity::EntityBool(Some(b)));
     }
     // i64
     if let Ok(i) = obj.extract::<i64>() {

diff --git a/src/ro_crate/constraints.rs b/src/ro_crate/constraints.rs
@@ -73,11 +73,11 @@ pub enum DynamicEntity {
     EntityVecString(Vec<String>),
     EntityId(Id),
     EntityIdVec(Vec<Id>),
-    EntityBool(bool),
     Entityi64(i64),
     Entityf64(f64),
     EntityVeci64(Vec<i64>),
     EntityVecf64(Vec<f64>),
+    EntityBool(Option<bool>),
     EntityVec(Vec<DynamicEntity>),
     EntityObject(HashMap<String, DynamicEntity>),
     EntityVecObject(Vec<HashMap<String, DynamicEntity>>),
@@ -157,9 +157,9 @@ mod tests {
 
     #[test]
     fn test_dynamic_entity_bool() {
-        let entity = DynamicEntity::EntityBool(true);
+        let entity = DynamicEntity::EntityBool(Some(true));
         match entity {
-            DynamicEntity::EntityBool(value) => assert!(value),
+            DynamicEntity::EntityBool(Some(value)) => assert!(value),
             _ => panic!("EntityBool variant expected"),
         }
     }
@@ -197,10 +197,10 @@ mod tests {
     #[test]
     fn test_dynamic_entity_fallback_empty() {
         let json_value = json!({});
-        let entity = DynamicEntity::Fallback(json_value.clone());
+        let entity = DynamicEntity::Fallback(Some(json_value.clone()));
         match entity {
-            DynamicEntity::Fallback(value) => assert_eq!(value, json_value),
-            _ => panic!("Fallback variant expected"),
+            DynamicEntity::Fallback(Some(value)) => assert_eq!(value, json_value),
+            _ => panic!("Fallback variant with expected value was not found"),
         }
     }
 

diff --git a/tests/fixtures/_ro-crate-metadata-minimal.json b/tests/fixtures/_ro-crate-metadata-minimal.json
@@ -21,7 +21,8 @@
   "@type": "CreativeWork",
   "description": "This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Australia License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/au/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.",
   "identifier": "https://creativecommons.org/licenses/by-nc-sa/3.0/au/",
-  "name": "Attribution-NonCommercial-ShareAlike 3.0 Australia (CC BY-NC-SA 3.0 AU)"
+  "name": "Attribution-NonCommercial-ShareAlike 3.0 Australia (CC BY-NC-SA 3.0 AU)",
+  "value": null
  }
  ]
-}
+}