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

fix use of uninitialized memory in compactflash leading to unpredictable failures

This commit is contained in:
zeromus 2010-06-13 03:16:11 +00:00
parent 0d6321b491
commit 8fd20b6b3b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desmume/src/addons/compactFlash.cpp
View File

@ -271,7 +271,7 @@ static void list_files(const char *filepath)
{ {
fname = (strlen(entry.cAlternateFileName)>0) ? entry.cAlternateFileName : entry.cFileName; fname = (strlen(entry.cAlternateFileName)>0) ? entry.cAlternateFileName : entry.cFileName;
add_file(fname, &entry, fileLevel); add_file(fname, &entry, fileLevel);
CFLASHLOG("cflash added %s\n",fname); printf("cflash added %s\n",fname);
if (numFiles==MAXFILES-1) break; if (numFiles==MAXFILES-1) break;
@ -309,6 +309,7 @@ static BOOL cflash_build_fat()
maxLevel = -1; maxLevel = -1;
files = (DIR_ENT *) malloc(MAXFILES*sizeof(DIR_ENT)); files = (DIR_ENT *) malloc(MAXFILES*sizeof(DIR_ENT));
memset(files,0,MAXFILES*sizeof(DIR_ENT));
if (files == NULL) return FALSE; if (files == NULL) return FALSE;
fileLink = (FILE_INFO *) malloc(MAXFILES*sizeof(FILE_INFO)); fileLink = (FILE_INFO *) malloc(MAXFILES*sizeof(FILE_INFO));
if (fileLink == NULL) if (fileLink == NULL)
@ -738,7 +739,7 @@ static unsigned int cflash_read(unsigned int address)
cluster2 = (((currLBA/512) - filesysData) / SECPERCLUS) + 2; cluster2 = (((currLBA/512) - filesysData) / SECPERCLUS) + 2;
// Reading from the MBR // Reading from the MBR
if (currLBA < 512) if (currLBA < 512 && currLBA >= 0)
{ {
p = (unsigned char*)&MBR; p = (unsigned char*)&MBR;
ret_value = T1ReadWord(p, currLBA); ret_value = T1ReadWord(p, currLBA);