Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 21:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent f_lseek() beyond file size when reading images

Browse Source
This commit is contained in:
d0k3 2016-04-10 16:05:09 +02:00
parent 9b21dbb5b7
commit 0d5ef48b4d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/fatfs/image.c
View File

@ -7,9 +7,12 @@ u32 mount_state = 0;
int ReadImageSectors(u8* buffer, u32 sector, u32 count) { int ReadImageSectors(u8* buffer, u32 sector, u32 count) {
UINT bytes_read; UINT bytes_read;
UINT ret; UINT ret;
if (!count) return -1;
if (!mount_state) return FR_INVALID_OBJECT; if (!mount_state) return FR_INVALID_OBJECT;
if (f_tell(&mount_file) != sector * 0x200) if (f_tell(&mount_file) != sector * 0x200) {
if (f_size(&mount_file) < sector * 0x200) return -1;
f_lseek(&mount_file, sector * 0x200); f_lseek(&mount_file, sector * 0x200);
}
ret = f_read(&mount_file, buffer, count * 0x200, &bytes_read); ret = f_read(&mount_file, buffer, count * 0x200, &bytes_read);
return (ret != 0) ? ret : (bytes_read != count * 0x200) ? -1 : 0; return (ret != 0) ? ret : (bytes_read != count * 0x200) ? -1 : 0;
} }
@ -17,6 +20,7 @@ int ReadImageSectors(u8* buffer, u32 sector, u32 count) {
int WriteImageSectors(const u8* buffer, u32 sector, u32 count) { int WriteImageSectors(const u8* buffer, u32 sector, u32 count) {
UINT bytes_written; UINT bytes_written;
UINT ret; UINT ret;
if (!count) return -1;
if (!mount_state) return FR_INVALID_OBJECT; if (!mount_state) return FR_INVALID_OBJECT;
if (f_tell(&mount_file) != sector * 0x200) if (f_tell(&mount_file) != sector * 0x200)
f_lseek(&mount_file, sector * 0x200); f_lseek(&mount_file, sector * 0x200);