GRIN/grin-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix TxHashSet file filter for Windows. (#2641)

Browse Source 
* Fix TxHashSet file filter for Windows.

* rustfmt

* Updating regexp

* Adding in test case
This commit is contained in:
David Burkett
2019-02-28 14:52:59 -05:00
committed by Yeastplume
parent d73124c469
commit d0ade29fc2
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/src/zip.rs
+8 -2
View File
@@ -73,8 +73,14 @@ where
for i in 0..archive.len() {
let mut file = archive.by_index(i)?;
let san_name = file.sanitized_name();
if san_name.to_str().unwrap_or("") != file.name() || !expected(&san_name) {
info!("ignoring a suspicious file: {}", file.name());
if san_name.to_str().unwrap_or("").replace("\\", "/") != file.name().replace("\\", "/")
|| !expected(&san_name)
{
info!(
"ignoring a suspicious file: {}, got {:?}",
file.name(),
san_name.to_str()
);
continue;
}
let file_path = dest.join(san_name);