claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NVR and Intel Flash functions now don't free the file name pointers until after all file I/O is done.

Browse Source
This commit is contained in:
OBattler
2017-06-22 18:38:36 +02:00
parent 21b3b6d51d
commit 08363e5ec2
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvr.c
View File

@@ -232,9 +232,6 @@ void loadnvr(void)
nvrmask = model_get_nvrmask(model);
}
free(nvr_name);
free(model_name);
if (!f || (model_get_nvrmask(model) == 0))
{
if (f)
@@ -250,6 +247,9 @@ void loadnvr(void)
nvrram[RTC_CENTURY] = BCD(19);
nvrram[RTC_REGB] = RTC_2412;
}
free(nvr_name);
free(model_name);
return;
}
fread(nvrram,128,1,f);
@@ -262,6 +262,9 @@ void loadnvr(void)
nvrram[RTC_REGB] = RTC_2412;
c = 1 << ((nvrram[RTC_REGA] & RTC_RS) - 1);
rtctime += (int)(RTCCONST * c * (1 << TIMER_SHIFT));
free(nvr_name);
free(model_name);
}
void savenvr(void)
@@ -283,20 +286,23 @@ void savenvr(void)
f = nvrfopen(nvr_name, L"wb");
}
free(nvr_name);
free(model_name);
if (!f || (model_get_nvrmask(oldmodel) == 0))
{
if (f)
{
fclose(f);
}
free(nvr_name);
free(model_name);
return;
}
fwrite(nvrram,128,1,f);
fclose(f);
free(nvr_name);
free(model_name);
}
void nvr_init(void)