Skip to content

fix: prevent panic when package.build is empty #17268

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

Merged
epage merged 2 commits into from
Aug 3, 2026
Merged

fix: prevent panic when package.build is empty #17268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6e9c90
test(build-script): cover empty `package.build`
raushan728 Jul 30, 2026
65f2ce9
fix(manifest): prevent panic on empty `package.build`
raushan728 Jul 28, 2026
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
22 changes: 19 additions & 3 deletions src/workspace/parser/targets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ pub(super) fn to_targets(
script_path
.file_stem()
.and_then(|s| s.to_str())
.unwrap_or("")
.expect("previously normalized")
);
targets.push(Target::custom_build_target(
&name,
Expand Down Expand Up @@ -906,7 +906,10 @@ fn validate_unique_names(targets: &[TomlTarget], target_kind: &str) -> CargoResu
fn validate_unique_build_scripts(scripts: &[String]) -> CargoResult<()> {
let mut seen = HashMap::default();
for script in scripts {
let stem = Path::new(script).file_stem().unwrap().to_str().unwrap();
let stem = Path::new(script)
.file_stem()
.and_then(|s| s.to_str())
.expect("previously normalized");
seen.entry(stem)
.or_insert_with(Vec::new)
.push(script.as_str());
Expand Down Expand Up @@ -1109,6 +1112,7 @@ pub fn normalize_build(
// Explicitly no build script.
Some(TomlPackageBuild::Auto(false)) => Ok(build.cloned()),
Some(TomlPackageBuild::SingleScript(build_file)) => {
validate_build_name(build_file)?;
let build_file = paths::normalize_path(Path::new(build_file));
let build = build_file.into_os_string().into_string().expect(
"`build_file` started as a String and `normalize_path` shouldn't have changed that",
Expand All @@ -1118,8 +1122,20 @@ pub fn normalize_build(
Some(TomlPackageBuild::Auto(true)) => {
Ok(Some(TomlPackageBuild::SingleScript(BUILD_RS.to_owned())))
}
Some(TomlPackageBuild::MultipleScript(_scripts)) => Ok(build.cloned()),
Some(TomlPackageBuild::MultipleScript(scripts)) => {
for script in scripts {
validate_build_name(script)?;
}
Ok(build.cloned())
}
}
}

fn validate_build_name(build: &str) -> CargoResult<()> {
if Path::new(build).file_stem().is_none() {
anyhow::bail!("invalid `package.build` file name");
}
Ok(())
}

fn name_or_panic(target: &TomlTarget) -> &str {
Expand Down
28 changes: 28 additions & 0 deletions tests/testsuite/build_script.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,6 +1422,34 @@ Caused by:
.run();
}

#[cargo_test]
fn build_script_empty() {
Comment thread
raushan728 marked this conversation as resolved.
let p = project()
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"
edition = "2024"
build = ""
"#,
)
.file("src/lib.rs", "")
.build();

p.cargo("check")
.with_status(101)
.with_stderr_data(str![[r#"
[ERROR] failed to parse manifest at `[ROOT]/foo/Cargo.toml`

Caused by:
invalid `package.build` file name

"#]])
.run();
}

#[cargo_test]
fn links_duplicates() {
// this tests that the links_duplicates are caught at resolver time
Expand Down