forked from M-Labs/rust-fatfs
Fix possible deadlock if reading dir entry fails.
This commit is contained in:
parent
d97ab1d1e1
commit
057eef07bb
10
src/dir.rs
10
src/dir.rs
@ -238,6 +238,7 @@ impl <'a, 'b> FatDir<'a, 'b> {
|
|||||||
FatDirIter {
|
FatDirIter {
|
||||||
rdr: self.rdr.clone(),
|
rdr: self.rdr.clone(),
|
||||||
fs: self.fs.clone(),
|
fs: self.fs.clone(),
|
||||||
|
err: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -281,6 +282,7 @@ impl <'a, 'b> FatDir<'a, 'b> {
|
|||||||
pub struct FatDirIter<'a, 'b: 'a> {
|
pub struct FatDirIter<'a, 'b: 'a> {
|
||||||
rdr: FatDirReader<'a, 'b>,
|
rdr: FatDirReader<'a, 'b>,
|
||||||
fs: FatFileSystemRef<'a, 'b>,
|
fs: FatFileSystemRef<'a, 'b>,
|
||||||
|
err: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl <'a, 'b> FatDirIter<'a, 'b> {
|
impl <'a, 'b> FatDirIter<'a, 'b> {
|
||||||
@ -325,12 +327,18 @@ impl <'a, 'b> Iterator for FatDirIter<'a, 'b> {
|
|||||||
type Item = io::Result<FatDirEntry<'a, 'b>>;
|
type Item = io::Result<FatDirEntry<'a, 'b>>;
|
||||||
|
|
||||||
fn next(&mut self) -> Option<Self::Item> {
|
fn next(&mut self) -> Option<Self::Item> {
|
||||||
|
if self.err {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
let mut lfn_buf = Vec::<u16>::new();
|
let mut lfn_buf = Vec::<u16>::new();
|
||||||
loop {
|
loop {
|
||||||
let res = self.read_dir_entry_data();
|
let res = self.read_dir_entry_data();
|
||||||
let data = match res {
|
let data = match res {
|
||||||
Ok(data) => data,
|
Ok(data) => data,
|
||||||
Err(err) => return Some(Err(err)),
|
Err(err) => {
|
||||||
|
self.err = true;
|
||||||
|
return Some(Err(err));
|
||||||
|
},
|
||||||
};
|
};
|
||||||
match data {
|
match data {
|
||||||
FatDirEntryData::File(data) => {
|
FatDirEntryData::File(data) => {
|
||||||
|
Loading…
Reference in New Issue
Block a user