Move static ctor out of unsafe context (#294)

mmastrac · Aug 7, 2023 · 1b5e7cd · 1b5e7cd
1 parent 3c8372b
commit 1b5e7cd
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ctor/src/lib.rs b/ctor/src/lib.rs
@@ -262,8 +262,12 @@ pub fn ctor(_attribute: TokenStream, function: TokenStream) -> TokenStream {
             :
             unsafe extern "C" fn() = {
                 #[cfg_attr(any(target_os = "linux", target_os = "android"), link_section = ".text.startup")]
-                unsafe extern "C" fn initer() {
-                    #storage_ident = Some(#expr);
+                extern "C" fn initer() {
+                    let val = Some(#expr);
+                    // Only write the value to `storage_ident` on startup
+                    unsafe {
+                        #storage_ident = val;
+                    }
                 }; initer }
             ;
         );