80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

NVR: Don't fatal on failure to read NVR properly

Browse Source
This commit is contained in:
Cacodemon345
2022-08-05 15:04:26 +06:00
parent c743d36028
commit be063529da
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvr.c
View File

@@ -237,6 +237,7 @@ nvr_load(void)
{ {
char *path; char *path;
FILE *fp; FILE *fp;
uint8_t regs[NVR_MAXSIZE] = { 0 };
/* Make sure we have been initialized. */ /* Make sure we have been initialized. */
if (saved_nvr == NULL) return(0); if (saved_nvr == NULL) return(0);
@@ -255,9 +256,12 @@ nvr_load(void)
fp = plat_fopen(path, "rb"); fp = plat_fopen(path, "rb");
saved_nvr->is_new = (fp == NULL); saved_nvr->is_new = (fp == NULL);
if (fp != NULL) { if (fp != NULL) {
memcpy(regs, saved_nvr->regs, sizeof(regs));
/* Read NVR contents from file. */ /* Read NVR contents from file. */
if (fread(saved_nvr->regs, 1, saved_nvr->size, fp) != saved_nvr->size) if (fread(saved_nvr->regs, 1, saved_nvr->size, fp) != saved_nvr->size) {
fatal("nvr_load(): Error reading data\n"); memcpy(saved_nvr->regs, regs, sizeof(regs));
saved_nvr->is_new = 1;
}
(void)fclose(fp); (void)fclose(fp);
} }
} else } else