Merge branch 'cleanup_exec' into 'master'

Account for nul terminator in total_args_envs_auxvpointee_size See merge request redox-os/relibc!782
2025-12-07 11:40:27 -07:00
parent 8f38bbe511 45a58f1a9e
commit d3f54836d1
1 changed files with 2 additions and 2 deletions
@@ -308,8 +308,8 @@ pub fn fexec_impl(
    )?;
    push(AT_PHENT)?;

-    let total_args_envs_auxvpointee_size = args.iter().map(|arg| arg.len()).sum::<usize>()
-        + envs.iter().map(|env| env.len()).sum::<usize>()
+    let total_args_envs_auxvpointee_size = args.iter().map(|arg| arg.len() + 1).sum::<usize>()
+        + envs.iter().map(|env| env.len() + 1).sum::<usize>()
        + extrainfo.cwd.map_or(0, |s| s.len() + 1)
        + extrainfo.default_scheme.map_or(0, |s| s.len() + 1);
    let args_envs_size_aligned = total_args_envs_auxvpointee_size.next_multiple_of(PAGE_SIZE);