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

Make sure bus members get escaped after parsing. 

Fixes https://gitlab.com/kicad/code/kicad/issues/6400
This commit is contained in:
Jeff Young 2020-12-20 18:01:34 +00:00
parent 7376c25ebe
commit 79c7cf12c9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/project/net_settings.cpp
View File

@ -454,11 +454,13 @@ bool NET_SETTINGS::ParseBusGroup( wxString aGroup, wxString* aName,
else if( aGroup[i] == '}' ) else if( aGroup[i] == '}' )
{ {
if( braceNesting ) if( braceNesting )
{
braceNesting--; braceNesting--;
}
else else
{ {
if( aMemberList ) if( aMemberList )
aMemberList->push_back( tmp ); aMemberList->push_back( EscapeString( tmp, CTX_NETNAME ) );
return true; return true;
} }
@ -467,7 +469,7 @@ bool NET_SETTINGS::ParseBusGroup( wxString aGroup, wxString* aName,
if( aGroup[i] == ' ' ) if( aGroup[i] == ' ' )
{ {
if( aMemberList ) if( aMemberList )
aMemberList->push_back( tmp ); aMemberList->push_back( EscapeString( tmp, CTX_NETNAME ) );
tmp.Clear(); tmp.Clear();
continue; continue;