srenblad/rust-fatfs
1
0
Fork 0
forked from M-Labs/rust-fatfs
Code Pull Requests Activity

fix: do not use hard-coded sector size when dealing with FSInfo sector

Browse Source 
Previous code is not working correctly if sector size is different than 512.
Creating test for this issue would require another binary blob in
repository so I am leaving it without test for now.
This commit is contained in:
Rafał Harabień 2018-12-05 01:35:03 +01:00
parent 77be6dd9d0
commit e45cfb5188
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fs.rs
View File

@ -622,7 +622,7 @@ impl<T: ReadWriteSeek> FileSystem<T> {
// read FSInfo sector if this is FAT32 // read FSInfo sector if this is FAT32
let mut fs_info = if fat_type == FatType::Fat32 { let mut fs_info = if fat_type == FatType::Fat32 {
disk.seek(SeekFrom::Start(bpb.fs_info_sector as u64 * 512))?; disk.seek(SeekFrom::Start(bpb.fs_info_sector as u64 * bpb.bytes_per_sector as u64))?;
FsInfoSector::deserialize(&mut disk)? FsInfoSector::deserialize(&mut disk)?
} else { } else {
FsInfoSector::default() FsInfoSector::default()
@ -847,7 +847,7 @@ impl<T: ReadWriteSeek> FileSystem<T> {
let mut fs_info = self.fs_info.borrow_mut(); let mut fs_info = self.fs_info.borrow_mut();
if self.fat_type == FatType::Fat32 && fs_info.dirty { if self.fat_type == FatType::Fat32 && fs_info.dirty {
let mut disk = self.disk.borrow_mut(); let mut disk = self.disk.borrow_mut();
disk.seek(SeekFrom::Start(self.bpb.fs_info_sector as u64 * 512))?; disk.seek(SeekFrom::Start(self.offset_from_sector(self.bpb.fs_info_sector as u32)))?;
fs_info.serialize(&mut *disk)?; fs_info.serialize(&mut *disk)?;
fs_info.dirty = false; fs_info.dirty = false;
} }