Only absolutize exe if abs path refers to a file and is executable

Fixes #670
facebook · Jun 4, 2024 · 5ec99fe · 5ec99fe
1 parent f593f4c
commit 5ec99fe
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/app/buck2_forkserver/src/run.rs b/app/buck2_forkserver/src/run.rs
@@ -353,7 +353,20 @@ pub fn maybe_absolutize_exe<'a>(
 
     let abs = spawned_process_cwd.join(exe);
     if fs_util::try_exists(&abs).context("Error absolute-izing executable")? {
-        return Ok(abs.into_path_buf().into());
+        let metadata = fs::metadata(&abs).context("Error getting metadata for path")?;
+        if metadata.is_file() {
+            #[cfg(unix)]
+            {
+                use std::os::unix::fs::PermissionsExt;
+                if metadata.permissions().mode() & 0o111 != 0 {
+                    return Ok(abs.into_path_buf().into());
+                }
+            }
+            #[cfg(not(unix))]
+            {
+                return Ok(abs.into_path_buf().into());
+            }
+        }
     }
 
     Ok(exe.into())