Merge pull request #379 from dave-tucker/fix-link-segfault

aya: Fix segfault in define_link_wrapper
aya-rs · Sep 5, 2022 · 9451699 · 9451699
2 parents 6f0637a + 8305ee1
commit 9451699
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/aya/src/programs/links.rs b/aya/src/programs/links.rs
@@ -258,7 +258,7 @@ macro_rules! define_link_wrapper {
 
         impl From<$wrapper> for $base {
             fn from(w: $wrapper) -> $base {
-                w.into()
+                w.0
             }
         }
     };

diff --git a/test/integration-test/src/tests/load.rs b/test/integration-test/src/tests/load.rs
@@ -61,7 +61,7 @@ fn multiple_btf_maps() -> anyhow::Result<()> {
 }
 
 fn is_loaded() -> bool {
-    let output = Command::new("bpftool").args(&["prog"]).output().unwrap();
+    let output = Command::new("bpftool").args(["prog"]).output().unwrap();
     let stdout = String::from_utf8(output.stdout).unwrap();
     stdout.contains("test_unload")
 }