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

[consider merging] Avoids a segfault 

This happens when an expression returns a class
object and that is converted to a string.
This commit is contained in:
Matthias Koefferlein 2023-12-28 00:55:05 +01:00
parent 940ef5319a
commit 4a4db5ea6e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tl/tl/tlVariant.cc
View File

@ -1815,9 +1815,21 @@ Variant::to_string () const
} else if (m_type == t_id) { } else if (m_type == t_id) {
r = "[id" + tl::to_string (m_var.m_id) + "]"; r = "[id" + tl::to_string (m_var.m_id) + "]";
} else if (m_type == t_user) { } else if (m_type == t_user) {
r = m_var.mp_user.cls->to_string (m_var.mp_user.object); void *obj = m_var.mp_user.object;
if (obj) {
r = m_var.mp_user.cls->to_string (obj);
} else {
r = "[class ";
r += m_var.mp_user.cls->name ();
r += "]";
}
} else if (m_type == t_user_ref) { } else if (m_type == t_user_ref) {
r = m_var.mp_user_ref.cls->to_string (m_var.mp_user_ref.cls->deref_proxy_const (reinterpret_cast <const tl::WeakOrSharedPtr *> (m_var.mp_user_ref.ptr)->get ())); const void *obj = m_var.mp_user_ref.cls->deref_proxy_const (reinterpret_cast <const tl::WeakOrSharedPtr *> (m_var.mp_user_ref.ptr)->get ());
if (obj) {
r = m_var.mp_user_ref.cls->to_string (obj);
} else {
r = "[null]";
}
} else { } else {
r = "[unknown]"; r = "[unknown]";
} }