try errno fun

metalbear-co · Dec 23, 2023 · 41fc60e · 41fc60e
1 parent 5303eb8
commit 41fc60e
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/mirrord/layer/src/detour.rs b/mirrord/layer/src/detour.rs
@@ -237,7 +237,10 @@ impl<S> Try for Detour<S> {
 
     fn branch(self) -> std::ops::ControlFlow<Self::Residual, Self::Output> {
         match self {
-            Detour::Success(s) => core::ops::ControlFlow::Continue(s),
+            Detour::Success(s) => {
+                errno::set_errno(errno::Errno(0));
+                core::ops::ControlFlow::Continue(s)
+            }
             Detour::Bypass(b) => core::ops::ControlFlow::Break(Detour::Bypass(b)),
             Detour::Error(e) => core::ops::ControlFlow::Break(Detour::Error(e)),
         }
@@ -348,7 +351,11 @@ where
     /// - `Error` -> Convert to libc value and return it.
     pub(crate) fn unwrap_or_bypass_with<F: FnOnce(Bypass) -> S>(self, op: F) -> S {
         match self {
-            Detour::Success(s) => s,
+            Detour::Success(s) => {
+                // in case we edited errno, reset it to 0
+                errno::set_errno(errno::Errno(0));
+                s
+            }
             Detour::Bypass(b) => op(b),
             Detour::Error(e) => e.into(),
         }
@@ -361,7 +368,11 @@ where
     /// `Error` -> Convert to libc value and return it.
     pub(crate) fn unwrap_or_bypass(self, value: S) -> S {
         match self {
-            Detour::Success(s) => s,
+            Detour::Success(s) => {
+                // in case we edited errno, reset it to 0
+                errno::set_errno(errno::Errno(0));
+                s
+            }
             Detour::Bypass(_) => value,
             Detour::Error(e) => e.into(),
         }