Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-26 00:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Kill a magic number and ensure file_name is nul-terminated

Browse Source
This commit is contained in:
Aaron Culliney 2015-06-01 22:08:58 -07:00
parent 3f38467c93
commit 064070be7c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/disk.c
View File

@ -765,7 +765,8 @@ const char *c_new_diskette_6(int drive, const char * const raw_file_name, int fo
cut_gz(file_name);
}
strncpy(disk6.disk[drive].file_name, file_name, 1023);
strncpy(disk6.disk[drive].file_name, file_name, FILE_NAME_SZ-1);
disk6.disk[drive].file_name[FILE_NAME_SZ-1] = '\0';
disk6.disk[drive].nibblized = is_nib(file_name);
disk6.disk[drive].skew_table = skew_table_6_do;
if (is_po(file_name)) {

3
src/disk.h
View File

@ -34,10 +34,11 @@
#define NIB_SEC_SIZE (NIB_TRACK_SIZE/NUM_SECTORS)
#define DSK_VOLUME 254
#define FILE_NAME_SZ (PATH_MAX>>2)
typedef struct diskette_t {
uint8_t track_image[NIB_TRACK_SIZE];
char file_name[1024];
char file_name[FILE_NAME_SZ];
bool nibblized;
bool is_protected;
bool track_valid;