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

SIMULATOR_FRAME_UI: catch all nlohmann::json::xxx errors. 

Previously, only nlohmann::json::type_error was captured, and other errors
were not handled, creating unhandled exception issue when reading broken
*.wks files.
From master branch.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/18309
This commit is contained in:
jean-pierre charras 2024-06-30 18:39:59 +02:00
parent 697ff382f8
commit 758ac90069
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eeschema/sim/simulator_frame.cpp
View File

@ -541,6 +541,7 @@ bool SIMULATOR_FRAME::LoadWorkbook( const wxString& aPath )
return true;
}
DisplayErrorMessage( this, wxString::Format( _( "Unable to load or parse file %s" ), aPath ) );
return false;
}

23
eeschema/sim/simulator_frame_ui.cpp
View File

@ -2079,6 +2079,29 @@ bool SIMULATOR_FRAME_UI::loadJsonWorkbook( const wxString& aPath )
return false;
}
catch( nlohmann::json::type_error& error )
{
wxLogTrace( traceSettings, wxT( "Json type error reading %s: %s" ), aPath, error.what() );
return false;
}
catch( nlohmann::json::invalid_iterator& error )
{
wxLogTrace( traceSettings, wxT( "Json invalid_iterator error reading %s: %s" ), aPath, error.what() );
return false;
}
catch( nlohmann::json::out_of_range& error )
{
wxLogTrace( traceSettings, wxT( "Json out_of_range error reading %s: %s" ), aPath, error.what() );
return false;
}
catch( ... )
{
wxLogTrace( traceSettings, wxT( "Error reading %s" ), aPath );
return false;
}
return true;
}