haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Windows SEH to catch fontconfig/freetype font read faults 

Related https://gitlab.com/kicad/code/kicad/-/issues/16484


(cherry picked from commit 05cbfc6aca)
This commit is contained in:
Marek Roszko 2024-01-05 15:22:33 -05:00 committed by Mark Roszko
parent 193e7f894d
commit edddf8a660
1 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
common/font/fontconfig.cpp
View File

@ -26,9 +26,15 @@
#include <macros.h> #include <macros.h>
#include <font/fontconfig.h> #include <font/fontconfig.h>
#ifdef __WIN32__
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
using namespace fontconfig; using namespace fontconfig;
static FONTCONFIG* g_config = nullptr; static FONTCONFIG* g_config = nullptr;
static bool g_fcInitSuccess = false;
/** /**
* A simple wrapper to avoid exporing fontconfig in the header * A simple wrapper to avoid exporing fontconfig in the header
@ -50,11 +56,40 @@ FONTCONFIG::FONTCONFIG()
}; };
/**
* This is simply a wrapper to call FcInit() with SEH for Windows
* SEH on Windows can only be used in functions without objects that might be unwinded
* (basically objects with destructors)
* For example, new FONTCONFIG() in Fontconfig() is creating a object with a destructor
* that *might* need to be unwinded. MSVC catches this and throws a compile error
*/
static void bootstrapFc()
{
#if defined( _MSC_VER )
__try
{
#endif
FcInit();
g_fcInitSuccess = true;
#if defined( _MSC_VER )
}
__except( GetExceptionCode() == STATUS_IN_PAGE_ERROR )
{
g_fcInitSuccess = false;
// We have documented cases that fontconfig while trying to cache fonts
// ends up using freetype to try and get font info
// freetype itself reads fonts through memory mapping instead of normal file APIs
// there are crashes reading fonts sometimes as a result that return STATUS_IN_PAGE_ERROR
}
#endif
}
FONTCONFIG* Fontconfig() FONTCONFIG* Fontconfig()
{ {
if( !g_config ) if( !g_config )
{ {
FcInit(); bootstrapFc();
g_config = new FONTCONFIG(); g_config = new FONTCONFIG();
} }
@ -154,6 +189,10 @@ FONTCONFIG::FF_RESULT FONTCONFIG::FindFont( const wxString &aFontName, wxString
int& aFaceIndex, bool aBold, bool aItalic ) int& aFaceIndex, bool aBold, bool aItalic )
{ {
FF_RESULT retval = FF_RESULT::FF_ERROR; FF_RESULT retval = FF_RESULT::FF_ERROR;
if( !g_fcInitSuccess )
return retval;
wxString qualifiedFontName = aFontName; wxString qualifiedFontName = aFontName;
wxScopedCharBuffer const fcBuffer = qualifiedFontName.ToUTF8(); wxScopedCharBuffer const fcBuffer = qualifiedFontName.ToUTF8();
@ -271,6 +310,9 @@ FONTCONFIG::FF_RESULT FONTCONFIG::FindFont( const wxString &aFontName, wxString
void FONTCONFIG::ListFonts( std::vector<std::string>& aFonts, const std::string& aDesiredLang ) void FONTCONFIG::ListFonts( std::vector<std::string>& aFonts, const std::string& aDesiredLang )
{ {
if( !g_fcInitSuccess )
return;
// be sure to cache bust if the language changed // be sure to cache bust if the language changed
if( m_fontInfoCache.empty() || m_fontCacheLastLang != aDesiredLang ) if( m_fontInfoCache.empty() || m_fontCacheLastLang != aDesiredLang )
{ {