foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-24 15:19:26 -05:00
Code Issues Packages 1 Wiki Activity

fix(fs): copyFile NUL path on macOS (#22216)

Browse source 
Fixes https://github.com/denoland/deno/issues/22211
This commit is contained in:
Divy Srivastava 2024-02-01 10:06:09 +05:30 committed by GitHub
parent e58b1900a7
commit 4f914dd161
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cli/tests/unit/copy_file_test.ts
View file

@ -236,3 +236,14 @@ Deno.test(
copyFileSyncMode("Hello world!".repeat(128 * 1024)); copyFileSyncMode("Hello world!".repeat(128 * 1024));
}, },
); );
Deno.test(
{ permissions: { read: true, write: true } },
async function copyFileNulPath() {
const fromFilename = "from.txt\0";
const toFilename = "to.txt\0";
await assertRejects(async () => {
await Deno.copyFile(fromFilename, toFilename);
}, TypeError);
},
);

13
ext/fs/std_fs.rs
View file

@ -413,10 +413,11 @@ fn copy_file(from: &Path, to: &Path) -> FsResult<()> {
use std::io::Read; use std::io::Read;
use std::os::unix::fs::OpenOptionsExt; use std::os::unix::fs::OpenOptionsExt;
use std::os::unix::fs::PermissionsExt; use std::os::unix::fs::PermissionsExt;
use std::os::unix::prelude::OsStrExt;
let from_str = CString::new(from.as_os_str().as_bytes()).unwrap(); let from_str = CString::new(from.as_os_str().as_encoded_bytes())
let to_str = CString::new(to.as_os_str().as_bytes()).unwrap(); .map_err(|err| io::Error::new(io::ErrorKind::InvalidInput, err))?;
let to_str = CString::new(to.as_os_str().as_encoded_bytes())
.map_err(|err| io::Error::new(io::ErrorKind::InvalidInput, err))?;
// SAFETY: `from` and `to` are valid C strings. // SAFETY: `from` and `to` are valid C strings.
// std::fs::copy does open() + fcopyfile() on macOS. We try to use // std::fs::copy does open() + fcopyfile() on macOS. We try to use
@ -555,8 +556,10 @@ fn cp(from: &Path, to: &Path) -> FsResult<()> {
use std::ffi::CString; use std::ffi::CString;
use std::os::unix::ffi::OsStrExt; use std::os::unix::ffi::OsStrExt;
let from_str = CString::new(from.as_os_str().as_bytes()).unwrap(); let from_str = CString::new(from.as_os_str().as_bytes())
let to_str = CString::new(to.as_os_str().as_bytes()).unwrap(); .map_err(|err| io::Error::new(io::ErrorKind::InvalidInput, err))?;
let to_str = CString::new(to.as_os_str().as_bytes())
.map_err(|err| io::Error::new(io::ErrorKind::InvalidInput, err))?;
// SAFETY: `from` and `to` are valid C strings. // SAFETY: `from` and `to` are valid C strings.
unsafe { unsafe {