Added NULL checks to DynamicStore

mullvad · Aug 26, 2024 · 84cd925 · 84cd925
1 parent c7a1626
commit 84cd925
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/system-configuration/examples/set_dns.rs b/system-configuration/examples/set_dns.rs
@@ -14,7 +14,9 @@ use system_configuration::{
 // network interface to 8.8.8.8 and 8.8.4.4
 
 fn main() {
-    let store = SCDynamicStoreBuilder::new("my-test-dyn-store").build();
+    let store = SCDynamicStoreBuilder::new("my-test-dyn-store")
+        .build()
+        .expect("Unable to create DynamicStore");
     let primary_service_uuid = get_primary_service_uuid(&store).expect("No PrimaryService active");
     println!("PrimaryService UUID: {}", primary_service_uuid);
 

diff --git a/system-configuration/examples/watch_dns.rs b/system-configuration/examples/watch_dns.rs
@@ -22,7 +22,8 @@ fn main() {
 
     let store = SCDynamicStoreBuilder::new("my-watch-dns-store")
         .callback_context(callback_context)
-        .build();
+        .build()
+        .expect("Unable to create DynamicStore");
 
     let watch_keys: CFArray<CFString> = CFArray::from_CFTypes(&[]);
     let watch_patterns =
@@ -34,7 +35,9 @@ fn main() {
         panic!("Unable to register notifications");
     }
 
-    let run_loop_source = store.create_run_loop_source();
+    let run_loop_source = store
+        .create_run_loop_source()
+        .expect("Unable to create run loop source");
     let run_loop = CFRunLoop::get_current();
     run_loop.add_source(&run_loop_source, unsafe { kCFRunLoopCommonModes });
 

diff --git a/system-configuration/src/dynamic_store.rs b/system-configuration/src/dynamic_store.rs
@@ -102,7 +102,7 @@ impl<T> SCDynamicStoreBuilder<T> {
     }
 
     /// Create the dynamic store session.
-    pub fn build(mut self) -> SCDynamicStore {
+    pub fn build(mut self) -> Option<SCDynamicStore> {
         let store_options = self.create_store_options();
         if let Some(callback_context) = self.callback_context.take() {
             SCDynamicStore::create(
@@ -161,7 +161,7 @@ impl SCDynamicStore {
         store_options: &CFDictionary,
         callout: SCDynamicStoreCallBack,
         context: *mut SCDynamicStoreContext,
-    ) -> Self {
+    ) -> Option<Self> {
         unsafe {
             let store = SCDynamicStoreCreateWithOptions(
                 kCFAllocatorDefault,
@@ -170,7 +170,11 @@ impl SCDynamicStore {
                 callout,
                 context,
             );
-            SCDynamicStore::wrap_under_create_rule(store)
+            if store.is_null() {
+                None
+            } else {
+                Some(SCDynamicStore::wrap_under_create_rule(store))
+            }
         }
     }
 
@@ -185,10 +189,10 @@ impl SCDynamicStore {
                 self.as_concrete_TypeRef(),
                 cf_pattern.as_concrete_TypeRef(),
             );
-            if !array_ref.is_null() {
-                Some(CFArray::wrap_under_create_rule(array_ref))
-            } else {
+            if array_ref.is_null() {
                 None
+            } else {
+                Some(CFArray::wrap_under_create_rule(array_ref))
             }
         }
     }
@@ -268,14 +272,18 @@ impl SCDynamicStore {
     }
 
     /// Creates a run loop source object that can be added to the application's run loop.
-    pub fn create_run_loop_source(&self) -> CFRunLoopSource {
+    pub fn create_run_loop_source(&self) -> Option<CFRunLoopSource> {
         unsafe {
             let run_loop_source_ref = SCDynamicStoreCreateRunLoopSource(
                 kCFAllocatorDefault,
                 self.as_concrete_TypeRef(),
                 0,
             );
-            CFRunLoopSource::wrap_under_create_rule(run_loop_source_ref)
+            if run_loop_source_ref.is_null() {
+                None
+            } else {
+                Some(CFRunLoopSource::wrap_under_create_rule(run_loop_source_ref))
+            }
         }
     }
 }