mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/eval): baseNameOf should not coerce paths into strings

Browse source 
... since this may import them to the store which changes their
basename.

Fixes b/350.

Change-Id: Iabd08ff4d6a424c66d6d7784d7a96b0c078f0a91
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10298
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Autosubmit: Adam Joseph <adam@westernsemico.com>
This commit is contained in:
Adam Joseph 2023-12-12 01:05:02 -08:00 committed by clbot
parent 8d4aa2c15c
commit 531f0c0c42
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tvix/eval/src/builtins/mod.rs
View file

@ -134,10 +134,18 @@ mod pure_builtins {
#[builtin("baseNameOf")] #[builtin("baseNameOf")]
async fn builtin_base_name_of(co: GenCo, s: Value) -> Result<Value, ErrorKind> { async fn builtin_base_name_of(co: GenCo, s: Value) -> Result<Value, ErrorKind> {
let span = generators::request_span(&co).await; let span = generators::request_span(&co).await;
let s = s let s = match s {
// it is important that builtins.baseNameOf does not
// coerce paths into strings, since this will turn them
// into store paths, and `builtins.baseNameOf
// ./config.nix` will return a hash-prefixed value like
// "hpmyf3vlqg5aadri97xglcvvjbk8xw3g-config.nix"
Value::Path(p) => NixString::from(p.to_string_lossy().to_string()),
_ => s
.coerce_to_string(co, CoercionKind::Weak, span) .coerce_to_string(co, CoercionKind::Weak, span)
.await? .await?
.to_str()?; .to_str()?,
};
let result: String = s.rsplit_once('/').map(|(_, x)| x).unwrap_or(&s).into(); let result: String = s.rsplit_once('/').map(|(_, x)| x).unwrap_or(&s).into();
Ok(result.into()) Ok(result.into())
} }