m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check if Main.backups->Pages->Filename is NULL

Browse Source 
to avoid segfaults
This commit is contained in:
Thomas Bernard 2023-04-11 01:57:03 +02:00
parent 3529859a9c
commit cd33490c66
No known key found for this signature in database
GPG Key ID: DB511043A31ACAAF
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/loadsave.c
View File

@ -2232,8 +2232,8 @@ void Rotate_safety_backups(void)
Init_context_backup_image(&context, file_name, Config_directory); Init_context_backup_image(&context, file_name, Config_directory);
context.Format=FORMAT_GIF; context.Format=FORMAT_GIF;
// Provide original file data, to store as a GIF Application Extension // Provide original file data, to store as a GIF Application Extension
context.Original_file_name = strdup(Main.backups->Pages->Filename); context.Original_file_name = Main.backups->Pages->Filename != NULL ? strdup(Main.backups->Pages->Filename) : NULL;
context.Original_file_directory = strdup(Main.backups->Pages->File_directory); context.Original_file_directory = Main.backups->Pages->File_directory != NULL ? strdup(Main.backups->Pages->File_directory) : NULL;
Save_image(&context); Save_image(&context);
Destroy_context(&context); Destroy_context(&context);

2
src/windows.c
View File

@ -1100,6 +1100,8 @@ void Print_filename(void)
// Partial copy of the name // Partial copy of the name
if (Main.backups->Pages->Filename_unicode != NULL) if (Main.backups->Pages->Filename_unicode != NULL)
Unicode_strlcpy(display_string, Main.backups->Pages->Filename_unicode, 256); Unicode_strlcpy(display_string, Main.backups->Pages->Filename_unicode, 256);
else if (Main.backups->Pages->Filename == NULL)
display_string[0] = 0;
else else
{ {
#ifdef ENABLE_FILENAMES_ICONV #ifdef ENABLE_FILENAMES_ICONV