rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Handle out of memory errors in fs::read/read_to_string

Browse Source
This commit is contained in:
Kornel
2023-10-09 14:32:15 +01:00
parent 03545161e6
commit 60f46289cf
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/std/src/fs.rs
View File

@@ -260,7 +260,8 @@ pub fn read<P: AsRef<Path>>(path: P) -> io::Result<Vec<u8>> {
fn inner(path: &Path) -> io::Result<Vec<u8>> { fn inner(path: &Path) -> io::Result<Vec<u8>> {
let mut file = File::open(path)?; let mut file = File::open(path)?;
let size = file.metadata().map(|m| m.len() as usize).ok(); let size = file.metadata().map(|m| m.len() as usize).ok();
let mut bytes = Vec::with_capacity(size.unwrap_or(0)); let mut bytes = Vec::new();
bytes.try_reserve_exact(size.unwrap_or(0)).map_err(|_| io::ErrorKind::OutOfMemory)?;
io::default_read_to_end(&mut file, &mut bytes, size)?; io::default_read_to_end(&mut file, &mut bytes, size)?;
Ok(bytes) Ok(bytes)
} }
@@ -302,7 +303,8 @@ pub fn read_to_string<P: AsRef<Path>>(path: P) -> io::Result<String> {
fn inner(path: &Path) -> io::Result<String> { fn inner(path: &Path) -> io::Result<String> {
let mut file = File::open(path)?; let mut file = File::open(path)?;
let size = file.metadata().map(|m| m.len() as usize).ok(); let size = file.metadata().map(|m| m.len() as usize).ok();
let mut string = String::with_capacity(size.unwrap_or(0)); let mut string = String::new();
string.try_reserve_exact(size.unwrap_or(0)).map_err(|_| io::ErrorKind::OutOfMemory)?;
io::default_read_to_string(&mut file, &mut string, size)?; io::default_read_to_string(&mut file, &mut string, size)?;
Ok(string) Ok(string)
} }
@@ -774,14 +776,14 @@ impl Read for &File {
// Reserves space in the buffer based on the file size when available. // Reserves space in the buffer based on the file size when available.
fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> { fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> {
let size = buffer_capacity_required(self); let size = buffer_capacity_required(self);
buf.reserve(size.unwrap_or(0)); buf.try_reserve_exact(size.unwrap_or(0)).map_err(|_| io::ErrorKind::OutOfMemory)?;
io::default_read_to_end(self, buf, size) io::default_read_to_end(self, buf, size)
} }
// Reserves space in the buffer based on the file size when available. // Reserves space in the buffer based on the file size when available.
fn read_to_string(&mut self, buf: &mut String) -> io::Result<usize> { fn read_to_string(&mut self, buf: &mut String) -> io::Result<usize> {
let size = buffer_capacity_required(self); let size = buffer_capacity_required(self);
buf.reserve(size.unwrap_or(0)); buf.try_reserve_exact(size.unwrap_or(0)).map_err(|_| io::ErrorKind::OutOfMemory)?;
io::default_read_to_string(self, buf, size) io::default_read_to_string(self, buf, size)
} }
} }