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

Checking some pointers for null (maybe responsible for crashes during PCell development)

This commit is contained in:
Matthias Koefferlein 2024-07-13 15:30:07 +02:00
parent acbbd92194
commit 7146db4762
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/db/db/dbLayout.cc
View File

@ -2872,15 +2872,18 @@ Layout::get_context_info (cell_index_type cell_index, LayoutOrCellContextInfo &i
if (pcell_variant) { if (pcell_variant) {
const db::PCellDeclaration *pcell_decl = ly->pcell_declaration (pcell_variant->pcell_id ()); const db::PCellDeclaration *pcell_decl = ly->pcell_declaration (pcell_variant->pcell_id ());
if (pcell_decl) {
const std::vector<db::PCellParameterDeclaration> &pcp = pcell_decl->parameter_declarations (); const std::vector<db::PCellParameterDeclaration> &pcp = pcell_decl->parameter_declarations ();
std::vector<db::PCellParameterDeclaration>::const_iterator pd = pcp.begin (); std::vector<db::PCellParameterDeclaration>::const_iterator pd = pcp.begin ();
for (std::vector<tl::Variant>::const_iterator p = pcell_variant->parameters ().begin (); p != pcell_variant->parameters ().end () && pd != pcp.end (); ++p, ++pd) { for (std::vector<tl::Variant>::const_iterator p = pcell_variant->parameters ().begin (); p != pcell_variant->parameters ().end () && pd != pcp.end (); ++p, ++pd) {
info.pcell_parameters.insert (std::make_pair (pd->get_name (), *p)); info.pcell_parameters.insert (std::make_pair (pd->get_name (), *p));
}
} }
const db::PCellHeader *header = ly->pcell_header (pcell_variant->pcell_id ()); const db::PCellHeader *header = ly->pcell_header (pcell_variant->pcell_id ());
info.pcell_name = header->get_name (); if (header) {
info.pcell_name = header->get_name ();
}
} else if (ly != this) { } else if (ly != this) {
info.cell_name = ly->cell_name (cptr->cell_index ()); info.cell_name = ly->cell_name (cptr->cell_index ());

5
src/lay/lay/layMacroEditorDialog.cc
View File

@ -3468,8 +3468,9 @@ MacroEditorDialog::leave_breakpoint_mode ()
set_exec_point (0, -1, -1); set_exec_point (0, -1, -1);
// refresh UI that might have been spoiled because we filter events // refresh UI that might have been spoiled because we filter events
if (lay::MainWindow::instance ()) { auto tl_widgets = QApplication::topLevelWidgets ();
lay::MainWindow::instance ()->update (); for (auto w = tl_widgets.begin (); w != tl_widgets.end (); ++w) {
(*w)->update ();
} }
} }