justdan96/tsMuxer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crashes with invalid font files in /usr/share/fonts (#116)

Browse Source 
tsMuxer called FT_Done_Face also if FT_New_Face reported an error. This caused
FT_Done_Face to be fed with a pointer that was either already freed in a
previous iteration of the loop, or was totally uninitialised from the start.

Fixes #63
This commit is contained in:
Daniel Kamil Kozar 2020-01-07 19:08:44 +01:00 committed by GitHub
parent 0c24c4f994
commit 08040e886f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tsMuxer/osdep/textSubtitlesRenderFT.cpp
View File

@ -79,12 +79,13 @@ void TextSubtitlesRenderFT::loadFontMap()
vector<string> fileList;
//sort(fileList.begin(), fileList.end());
findFilesRecursive(FONT_ROOT, "*.ttf", &fileList);
FT_Face font;
for (int i = 0; i < fileList.size(); ++i)
{
//LTRACE(LT_INFO, 2, "before loading font " << fileList[i].c_str());
if (strEndWith(fileList[i], "AppleMyungjo.ttf"))
continue;
FT_Face font;
int error = FT_New_Face( library, fileList[i].c_str(), 0, &font);
if (error == 0)
{
@ -96,8 +97,9 @@ void TextSubtitlesRenderFT::loadFontMap()
m_fontNameToFile[fontFamily] = fileList[i];
else if (fileList[i].length() < itr->second.length())
m_fontNameToFile[fontFamily] = fileList[i];
FT_Done_Face(font);
}
FT_Done_Face(font);
//LTRACE(LT_INFO, 2, "after loading font " << fileList[i].c_str());
}
}