ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patch 2182315 by riccardom that close 1722970 too: 

The patch checks the fd before calling fseek and if it is
found null it logs it and returns 0 instead of segfaulting.
This commit is contained in:
yabause 2008-10-21 19:50:47 +00:00
parent 45fa0170f7
commit c6acb6dba6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
desmume/src/cflash.cpp
View File

@ -579,9 +579,13 @@ static u16 fread_buffered(int dirent,u32 cluster,u32 offset) {
if (dirent == activeDirEnt) { if (dirent == activeDirEnt) {
if ((offset < bufferStart) || (offset >= bufferStart + 512)) { if ((offset < bufferStart) || (offset >= bufferStart + 512)) {
//SetFilePointer(hFile,offset,NULL,FILE_BEGIN); if (!hFile) {
LOCAL_LOG("fread_buffered with hFile null with"
"offset %lu and bufferStart %lu\n",
offset, bufferStart);
return 0;
}
fseek(hFile, offset, SEEK_SET); fseek(hFile, offset, SEEK_SET);
//ReadFile(hFile,&freadBuffer,512,&dwBytesRead,NULL);
fread(&freadBuffer, 1, 512, hFile); fread(&freadBuffer, 1, 512, hFile);
bufferStart = offset; bufferStart = offset;
} }
@ -589,10 +593,8 @@ static u16 fread_buffered(int dirent,u32 cluster,u32 offset) {
return freadBuffer[(offset-bufferStart)>>1]; return freadBuffer[(offset-bufferStart)>>1];
} }
if (activeDirEnt != -1) if (activeDirEnt != -1)
//CloseHandle(hFile);
fclose(hFile); fclose(hFile);
/* replaced strcpy/cat with strncpy/strcat to fixed possible buffer overruns */
strncpy(fpath,sRomPath,256); strncpy(fpath,sRomPath,256);
strncat(fpath,DIR_SEP,256-strlen(fpath)); strncat(fpath,DIR_SEP,256-strlen(fpath));
@ -659,9 +661,8 @@ cflash_read(unsigned int address) {
data[0] = block_buffer[currLBA - buffered_start_index]; data[0] = block_buffer[currLBA - buffered_start_index];
data[1] = block_buffer[currLBA + 1 - buffered_start_index]; data[1] = block_buffer[currLBA + 1 - buffered_start_index];
#else #else
lseek( disk_image, currLBA, SEEK_SET); LSEEK_FN( disk_image, currLBA, SEEK_SET);
read( disk_image, data, 2); READ_FN( disk_image, data, 2);
#endif #endif
ret_value = data[1] << 8 | ret_value = data[1] << 8 |
data[0]; data[0];