folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BuildROMS: Avoid theoretical buffer overruns

Browse source
This commit is contained in:
Mark Pizzolato 2019-12-30 13:54:14 -08:00
parent 78fa98fd7e
commit 1d1fe6f329
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sim_BuildROMs.c
View file

@ -172,7 +172,7 @@ unsigned int checksum = 0;
char *c; char *c;
int i; int i;
char cleaned_rom_filename[512]; char cleaned_rom_filename[512];
char include_filename[512]; char *include_filename;
char array_name[512]; char array_name[512];
if (NULL == (rFile = fopen (rom_filename, "rb"))) { if (NULL == (rFile = fopen (rom_filename, "rb"))) {
@ -207,15 +207,16 @@ if ((c = strchr (array_name, '.')))
*c = '_'; *c = '_';
if ((c = strchr (array_name, '/'))) if ((c = strchr (array_name, '/')))
*c = '_'; *c = '_';
include_filename[sizeof (include_filename) - 1] = '\0'; include_filename = (char *)calloc (3 + strlen (cleaned_rom_filename), sizeof (*include_filename));
snprintf (include_filename, sizeof (include_filename) - 1, "%s.h", cleaned_rom_filename); sprintf (include_filename, "%s.h", cleaned_rom_filename);
if ((c = strrchr (include_filename, '/'))) if ((c = strrchr (include_filename, '/')))
sprintf (c+1, "%s.h", array_name); sprintf (c+1, "%s.h", array_name);
else else
snprintf (include_filename, sizeof (include_filename) - 1, "%s.h", array_name); sprintf (include_filename, "%s.h", array_name);
printf ("The ROMs array entry for this new ROM image file should look something like:\n"); printf ("The ROMs array entry for this new ROM image file should look something like:\n");
printf ("{\"%s\", \"%s\", %d, 0x%08X, \"%s\"}\n", printf ("{\"%s\", \"%s\", %d, 0x%08X, \"%s\"}\n",
rom_filename, include_filename, (int)(statb.st_size), checksum, array_name); rom_filename, include_filename, (int)(statb.st_size), checksum, array_name);
free (include_filename);
free (ROMData); free (ROMData);
return 1; return 1;
} }