diff options
| author | Michael Wörister <mworister@microsoft.com> | 2024-02-19 14:03:09 +0100 |
|---|---|---|
| committer | Michael Wörister <mworister@microsoft.com> | 2024-03-14 09:54:29 +0100 |
| commit | 3c49fe0cbd86b452ba519ffe98ece4a620caee23 (patch) | |
| tree | 5fd49bbe6bc6a25ca54ec6512cb06aac6672f8a1 | |
| parent | 9ce37dc7290e60bd0dfc7a5d4fcdbbd836f989f0 (diff) | |
| download | rust-3c49fe0cbd86b452ba519ffe98ece4a620caee23.tar.gz rust-3c49fe0cbd86b452ba519ffe98ece4a620caee23.zip | |
link.exe: don't embed full path to PDB file in binary.
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/linker.rs | 9 | ||||
| -rw-r--r-- | tests/run-make/pdb-alt-path/Makefile | 20 | ||||
| -rw-r--r-- | tests/run-make/pdb-alt-path/main.rs | 3 |
3 files changed, 32 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs index b4e054417f3..65bff08d781 100644 --- a/compiler/rustc_codegen_ssa/src/back/linker.rs +++ b/compiler/rustc_codegen_ssa/src/back/linker.rs @@ -929,6 +929,15 @@ impl<'a> Linker for MsvcLinker<'a> { // from the CodeView line tables in the object files. self.cmd.arg("/DEBUG"); + // Default to emitting only the file name of the PDB file into + // the binary instead of the full path. Emitting the full path + // may leak private information (such as user names). + // See https://github.com/rust-lang/rust/issues/87825. + // + // This default behavior can be overridden by explicitly passing + // `-Clink-arg=/PDBALTPATH:...` to rustc. + self.cmd.arg("/PDBALTPATH:%_PDB%"); + // This will cause the Microsoft linker to embed .natvis info into the PDB file let natvis_dir_path = self.sess.sysroot.join("lib\\rustlib\\etc"); if let Ok(natvis_dir) = fs::read_dir(&natvis_dir_path) { diff --git a/tests/run-make/pdb-alt-path/Makefile b/tests/run-make/pdb-alt-path/Makefile new file mode 100644 index 00000000000..d7d435957a3 --- /dev/null +++ b/tests/run-make/pdb-alt-path/Makefile @@ -0,0 +1,20 @@ +include ../tools.mk + +# only-windows-msvc + +all: + # Test that we don't have the full path to the PDB file in the binary + $(RUSTC) main.rs -g --crate-name my_crate_name --crate-type bin + $(CGREP) "my_crate_name.pdb" < $(TMPDIR)/my_crate_name.exe + $(CGREP) -v "\\my_crate_name.pdb" < $(TMPDIR)/my_crate_name.exe + + # Test that backtraces still can find debuginfo by checking that they contain symbol names and + # source locations. + RUST_BACKTRACE="full" $(TMPDIR)/my_crate_name.exe &> $(TMPDIR)/backtrace.txt || exit 0 + $(CGREP) "my_crate_name::main" < $(TMPDIR)/backtrace.txt + $(CGREP) "pdb-alt-path\\main.rs:2" < $(TMPDIR)/backtrace.txt + + # Test that explicitly passed `-Clink-arg=/PDBALTPATH:...` is respected + $(RUSTC) main.rs -g --crate-name my_crate_name --crate-type bin -Clink-arg=/PDBALTPATH:abcdefg.pdb + $(CGREP) "abcdefg.pdb" < $(TMPDIR)/my_crate_name.exe + $(CGREP) -v "my_crate_name.pdb" < $(TMPDIR)/my_crate_name.exe diff --git a/tests/run-make/pdb-alt-path/main.rs b/tests/run-make/pdb-alt-path/main.rs new file mode 100644 index 00000000000..e95109fd08a --- /dev/null +++ b/tests/run-make/pdb-alt-path/main.rs @@ -0,0 +1,3 @@ +fn main() { + panic!("backtrace please"); +} |