DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: Fix error-type conversion on Windows

Browse source
This commit is contained in:
Chris Hennick 2024-05-15 15:22:49 -07:00
parent 492c96c18f
commit 23068ad7c2
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/read.rs
View file

@ -13,6 +13,7 @@ use crate::types::{AesMode, AesVendorVersion, DateTime, System, ZipFileData};
use crate::zipcrypto::{ZipCryptoReader, ZipCryptoReaderValid, ZipCryptoValidator};
use indexmap::IndexMap;
use std::borrow::Cow;
use std::convert::Infallible;
use std::ffi::OsString;
use std::fs::create_dir_all;
use std::io::{self, copy, prelude::*, sink};
@ -689,7 +690,9 @@ impl<R: Read + Seek> ZipArchive<R> {
if file.is_symlink() && (cfg!(unix) || cfg!(windows)) {
let mut target = Vec::with_capacity(file.size() as usize);
file.read_exact(&mut target)?;
let target = try_utf8_to_os_string(target)?;
let Ok(target) = try_utf8_to_os_string(target) else {
return Err(ZipError::InvalidArchive("Invalid UTF-8 as symlink target"));
};
let target_path: PathBuf = directory.as_ref().join(target.clone());
#[cfg(unix)]
{
@ -925,14 +928,16 @@ impl<R: Read + Seek> ZipArchive<R> {
}
#[cfg(unix)]
fn try_utf8_to_os_string(utf8_bytes: Vec<u8>) -> std::io::Result<OsString> {
fn try_utf8_to_os_string(utf8_bytes: Vec<u8>) -> Result<OsString, Infallible> {
use std::os::unix::ffi::OsStringExt;
Ok(OsString::from_vec(utf8_bytes))
}
#[cfg(windows)]
fn to_os_string(utf8_bytes: Vec<u8>) -> std::io::Result<OsString> {
Ok(OsString::from(String::from_utf8(target)?))
fn try_utf8_to_os_string(utf8_bytes: Vec<u8>) -> Result<OsString, std::string::FromUtf8Error> {
Ok(OsString::from(String::from_utf8(utf8_bytes).map_err(
|_| ZipError::InvalidArchive("Invalid UTF-8 in symlink target"),
)))
}
const fn unsupported_zip_error<T>(detail: &'static str) -> ZipResult<T> {