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

Fix Sentry crash for font loads 

We cache newstroke loading, but if we have threaded loads, we might ask
multiple threads to load the newstroke font at the same time.  This
causes conflicts in the vector allocations->crashes
This commit is contained in:
Seth Hillbrand 2022-08-23 09:51:20 -07:00
parent 142229089f
commit 7a8b188569
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/font/stroke_font.cpp
View File

@ -38,6 +38,8 @@
// The "official" name of the building Kicad stroke font (always existing)
#include <font/kicad_font_name.h>
#include <mutex>
using namespace KIFONT;
@ -53,6 +55,7 @@ static constexpr int FONT_OFFSET = -10;
bool g_defaultFontInitialized = false;
std::vector<std::shared_ptr<GLYPH>> g_defaultFontGlyphs;
std::vector<BOX2D>* g_defaultFontGlyphBoundingBoxes;
std::mutex g_defaultFontLoadMutex;
STROKE_FONT::STROKE_FONT() :
@ -99,6 +102,9 @@ void buildGlyphBoundingBox( std::shared_ptr<STROKE_GLYPH>& aGlyph, double aGlyph
void STROKE_FONT::loadNewStrokeFont( const char* const aNewStrokeFont[], int aNewStrokeFontSize )
{
// Protect the initialization sequence against multiple entries
std::lock_guard<std::mutex> lock( g_defaultFontLoadMutex );
if( !g_defaultFontInitialized )
{
g_defaultFontGlyphs.reserve( aNewStrokeFontSize );