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

Remove usage of MAX_PATH_CHARACTERS in loadrecoil.c

Browse Source
This commit is contained in:
Thomas Bernard 2019-02-18 16:11:32 +01:00
parent e0401e8205
commit 4bbb4f142d
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/loadrecoil.c
View File

@ -32,6 +32,7 @@
#include "loadsave.h" #include "loadsave.h"
#include "io.h" #include "io.h"
#include "errors.h" #include "errors.h"
#include "unicode.h"
#include "recoil.h" #include "recoil.h"
@ -102,7 +103,7 @@ void Load_Recoil_Image(T_IO_Context *context)
if (recoil) if (recoil)
{ {
#ifdef WIN32 #ifdef WIN32
char tempfilename[MAX_PATH_CHARACTERS]; char * tempfilename = NULL;
#endif #endif
const char * filename = context->File_name; const char * filename = context->File_name;
*(const RECOILVtbl **)recoil = &vtbl; // set Vtable *(const RECOILVtbl **)recoil = &vtbl; // set Vtable
@ -112,8 +113,10 @@ void Load_Recoil_Image(T_IO_Context *context)
// get the full file extension from the long filename (unicode) // get the full file extension from the long filename (unicode)
// RECOIL doesn't recognize file if the "short" extension is passed, // RECOIL doesn't recognize file if the "short" extension is passed,
// ie .DEE instead of .deep // ie .DEE instead of .deep
int i; size_t i;
for (i = 0; context->File_name_unicode[i] != 0 && i < (int)sizeof(tempfilename) - 1; i++) size_t len = Unicode_strlen(context->File_name_unicode);
tempfilename = (char *)malloc(len + 1);
for (i = 0; i < len; i++)
tempfilename[i] = (context->File_name_unicode[i] < 256) ? (char)context->File_name_unicode[i] : '_'; tempfilename[i] = (context->File_name_unicode[i] < 256) ? (char)context->File_name_unicode[i] : '_';
tempfilename[i] = '\0'; tempfilename[i] = '\0';
filename = tempfilename; filename = tempfilename;
@ -205,6 +208,9 @@ void Load_Recoil_Image(T_IO_Context *context)
} }
} }
RECOIL_Delete(recoil); RECOIL_Delete(recoil);
#ifdef WIN32
free(tempfilename);
#endif
} }
free(file_content); free(file_content);
} }