Merge pull request #9 from helmerapp/fix/segfault-while-extracting-ns…

…string fix: prevent segfaults while extracting NSString
helmerapp · Jan 28, 2025 · c76a959 · c76a959
2 parents 8777b36 + ba61d3e
commit c76a959
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/platform/macos/objc_wrap.rs b/src/platform/macos/objc_wrap.rs
@@ -309,8 +309,12 @@ impl NSString {
 
     pub(crate) fn from_id_unretained(id: *mut AnyObject) -> Self {
         unsafe {
-            let _: *mut AnyObject = msg_send![id, retain];
-            Self(id)
+            if (id as *const AnyObject).is_null() {
+                Self::new("")
+            } else {
+                let _: *mut AnyObject = msg_send![id, retain];
+                Self(id)
+            }
         }
     }