luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid a crash on invalid vector fonts

This commit is contained in:
Matthias Koefferlein 2026-08-15 00:09:34 +02:00
parent fb26cf6433
commit 2e54668001
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/db/db/dbHershey.cc
View File

@ -95,9 +95,19 @@ hershey_font_names ()
return ff; return ff;
} }
static unsigned int safe_font (unsigned int f)
{
if (f >= (unsigned int) (sizeof (fonts) / sizeof (fonts [0]))) {
return 0;
} else {
return f;
}
}
size_t size_t
hershey_count_edges (const std::string &s, unsigned int f) hershey_count_edges (const std::string &s, unsigned int f)
{ {
f = safe_font (f);
HersheyFont *fp = fonts [f]; HersheyFont *fp = fonts [f];
size_t n = 0; size_t n = 0;
@ -127,18 +137,21 @@ hershey_count_edges (const std::string &s, unsigned int f)
int int
hershey_font_width (unsigned int f) hershey_font_width (unsigned int f)
{ {
f = safe_font (f);
return fonts [f]->width; return fonts [f]->width;
} }
int int
hershey_font_height (unsigned int f) hershey_font_height (unsigned int f)
{ {
f = safe_font (f);
return fonts [f]->height; return fonts [f]->height;
} }
db::DBox db::DBox
hershey_text_box (const std::string &s, unsigned int f) hershey_text_box (const std::string &s, unsigned int f)
{ {
f = safe_font (f);
HersheyFont *fp = fonts [f]; HersheyFont *fp = fonts [f];
int wl = 0; int wl = 0;
@ -183,6 +196,8 @@ hershey_text_box (const std::string &s, unsigned int f)
void void
hershey_justify (const std::string &s, unsigned int f, db::DBox bx, HAlign halign, VAlign valign, std::vector<db::DPoint> &linestarts, double &left, double &bottom) hershey_justify (const std::string &s, unsigned int f, db::DBox bx, HAlign halign, VAlign valign, std::vector<db::DPoint> &linestarts, double &left, double &bottom)
{ {
f = safe_font (f);
left = 0.0; left = 0.0;
bottom = 0.0; bottom = 0.0;
@ -253,6 +268,8 @@ hershey_justify (const std::string &s, unsigned int f, db::DBox bx, HAlign halig
basic_hershey_edge_iterator::basic_hershey_edge_iterator (const std::string &s, unsigned int f, const std::vector<db::DPoint> &line_starts) basic_hershey_edge_iterator::basic_hershey_edge_iterator (const std::string &s, unsigned int f, const std::vector<db::DPoint> &line_starts)
: m_line (0), m_string (s), m_edge (0), m_edge_end (0), m_linestarts (line_starts) : m_line (0), m_string (s), m_edge (0), m_edge_end (0), m_linestarts (line_starts)
{ {
f = safe_font (f);
m_fp = fonts [f]; m_fp = fonts [f];
mp_cp = m_string.c_str (); mp_cp = m_string.c_str ();