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

Minor json parse safety

This commit is contained in:
Marek Roszko 2020-10-07 22:00:02 -04:00
parent 09ac5e0fdc
commit 0b43dc6e16
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/project/net_settings.cpp
View File

@ -28,7 +28,7 @@ const int netSettingsSchemaVersion = 0;
static OPT<int> getInPcbUnits( const nlohmann::json& aObj, const std::string& aKey, OPT<int> aDefault = OPT<int>() ) static OPT<int> getInPcbUnits( const nlohmann::json& aObj, const std::string& aKey, OPT<int> aDefault = OPT<int>() )
{ {
if( aObj.contains( aKey ) ) if( aObj.contains( aKey ) && aObj[aKey].is_number() )
return PcbMillimeter2iu( aObj[aKey].get<double>() ); return PcbMillimeter2iu( aObj[aKey].get<double>() );
else else
return aDefault; return aDefault;
@ -124,7 +124,7 @@ NET_SETTINGS::NET_SETTINGS( JSON_SETTINGS* aParent, const std::string& aPath ) :
auto getInSchematicUnits = auto getInSchematicUnits =
[]( const nlohmann::json& aObj, const std::string& aKey, int aDefault ) []( const nlohmann::json& aObj, const std::string& aKey, int aDefault )
{ {
if( aObj.contains( aKey ) ) if( aObj.contains( aKey ) && aObj[aKey].is_number() )
return SchMils2iu( aObj[aKey].get<double>() ); return SchMils2iu( aObj[aKey].get<double>() );
else else
return aDefault; return aDefault;