ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7902 from orenc17/fat_fix 

Fix overflow in disk_get_sector_size()
pull/8253/merge
Cruz Monrreal 2018-10-11 10:08:46 -05:00 committed by GitHub
parent c43a3f4dfb 9e337bb600
commit 2b04a02eb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
features/storage/filesystem/fat/FATFileSystem.cpp
View File

@ -168,7 +168,10 @@ void ff_memfree(void *p)
// Implementation of diskio functions (see ChaN/diskio.h) // Implementation of diskio functions (see ChaN/diskio.h)
static WORD disk_get_sector_size(BYTE pdrv) static WORD disk_get_sector_size(BYTE pdrv)
{ {
WORD ssize = _ffs[pdrv]->get_erase_size(); bd_size_t sector_size = _ffs[pdrv]->get_erase_size();
MBED_ASSERT(sector_size <= WORD(-1));
WORD ssize = sector_size;
if (ssize < 512) { if (ssize < 512) {
ssize = 512; ssize = 512;
} }