Skip to content

std: reject interior NULs in UEFI env::join_paths segments #599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SebTardif wants to merge 1 commit into
base: main
Choose a base branch
from
Open

std: reject interior NULs in UEFI env::join_paths segments #599

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions library/std/src/sys/paths/uefi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,11 @@ where
}

let v = path.as_ref().encode_wide().collect::<Vec<u16>>();
if v.contains(&PATHS_SEP) {
// Interior NULs would truncate when the joined string is later treated
// as a C-style wide string (e.g. the UEFI Shell Path variable).
if v.contains(&0) {
return Err(JoinPathsError);
} else if v.contains(&PATHS_SEP) {
return Err(JoinPathsError);
}

Expand All @@ -101,7 +105,7 @@ where

impl fmt::Display for JoinPathsError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
"path segment contains `;`".fmt(f)
"path segment contains `;` or interior NUL".fmt(f)
}
}

Expand Down