leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a bug

Browse source
This commit is contained in:
Igor Katson 2021-07-31 13:13:04 +01:00
parent 175d5c7a97
commit b301b159da
4 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/librqbit_core/src/torrent_metainfo.rs
View file

@ -132,7 +132,7 @@ impl<'a, ByteBuf> FileIteratorName<'a, ByteBuf> {
};
let bit = std::str::from_utf8(part.as_ref())
.context("cannot decode filename bit as UTF-8")?;
if bit.contains("..") {
if bit == ".." {
anyhow::bail!("path traversal detected, \"..\" in filename bit {:?}", bit);
}
if bit.contains(std::path::MAIN_SEPARATOR) {
@ -192,17 +192,7 @@ impl<BufType: AsRef<[u8]>> TorrentMetaV1Info<BufType> {
Ok(single_it.chain(multi_it).flatten())
}
pub fn iter_file_lengths(&self) -> anyhow::Result<impl Iterator<Item = u64> + '_> {
self.is_single_file()?;
let it = std::iter::once(self.length)
.chain(
self.files
.as_deref()
.unwrap_or_default()
.iter()
.map(|f| Some(f.length)),
)
.flatten();
Ok(it)
Ok(self.iter_filenames_and_lengths()?.map(|(_, l)| l))
}
}