mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rdtk] improve rdtk_font_load_descriptor_file 

do simpler and better error handling
This commit is contained in:
akallabeth 2024-09-15 07:26:02 +02:00
parent ca1791cfe8
commit 8a3f2be769
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rdtk/librdtk/rdtk_font.c
View File

@ -161,23 +161,19 @@ static char* rdtk_font_load_descriptor_file(const char* filename, size_t* pSize)
if (!fp)
return NULL;
_fseeki64(fp, 0, SEEK_END);
if (_fseeki64(fp, 0, SEEK_END) != 0)
goto fail;
fileSize.i64 = _ftelli64(fp);
_fseeki64(fp, 0, SEEK_SET);
if (_fseeki64(fp, 0, SEEK_SET) != 0)
goto fail;
if (fileSize.i64 < 1)
{
(void)fclose(fp);
return NULL;
}
goto fail;
uint8_t* buffer = (uint8_t*)malloc(fileSize.s + 2);
if (!buffer)
{
(void)fclose(fp);
return NULL;
}
goto fail;
size_t readSize = fread(buffer, fileSize.s, 1, fp);
if (readSize == 0)
@ -198,6 +194,10 @@ static char* rdtk_font_load_descriptor_file(const char* filename, size_t* pSize)
buffer[fileSize.s + 1] = '\0';
*pSize = fileSize.s;
return (char*)buffer;
fail:
(void)fclose(fp);
return NULL;
}
static int rdtk_font_convert_descriptor_code_to_utf8(const char* str, uint8_t* utf8)