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

Fix crash when trying to draw a text with non printable chars. 

Fixes #10772
https://gitlab.com/kicad/code/kicad/issues/10772
This commit is contained in:
jean-pierre charras 2022-02-06 08:34:19 +01:00
parent d9c04da407
commit 6a9607b76f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/font/stroke_font.cpp
View File

@ -238,8 +238,11 @@ VECTOR2I STROKE_FONT::GetTextAsGlyphs( BOX2I* aBBox, std::vector<std::unique_ptr
{ {
if( c >= (int) m_glyphBoundingBoxes->size() || c < 0 ) if( c >= (int) m_glyphBoundingBoxes->size() || c < 0 )
{ {
// Filtering non existing glyphes and non printable chars
if( c == '\t' ) if( c == '\t' )
c = ' '; c = ' ';
else if( c < ' ' ) // Non printable char
c = '?';
else else
c = '?'; c = '?';
} }
@ -247,7 +250,7 @@ VECTOR2I STROKE_FONT::GetTextAsGlyphs( BOX2I* aBBox, std::vector<std::unique_ptr
// Index into bounding boxes table // Index into bounding boxes table
int dd = (signed) c - ' '; int dd = (signed) c - ' ';
if( dd == 0 ) if( dd <= 0 )
{ {
// 'space' character - draw nothing, advance cursor position // 'space' character - draw nothing, advance cursor position
cursor.x += KiROUND( glyphSize.x * SPACE_WIDTH ); cursor.x += KiROUND( glyphSize.x * SPACE_WIDTH );