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

Be more careful about EOF processing when reading netlist. 

Fixes: lp:1845848
* https://bugs.launchpad.net/kicad/+bug/1845848
This commit is contained in:
Jeff Young 2019-10-07 12:50:02 +01:00
parent 34b26a0ac7
commit 890e1c9ea0
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pcbnew/kicad_netlist_reader.cpp
View File

@ -83,8 +83,7 @@ void KICAD_NETLIST_PARSER::skipCurrent()
void KICAD_NETLIST_PARSER::Parse()
{
int plevel = 0; // the count of ')' to read and end of file,
// after parsing all sections
int plevel = 0; // the count of ')' to read at end of file after parsing all sections
while( ( token = NextTok() ) != T_EOF )
{
@ -94,8 +93,7 @@ void KICAD_NETLIST_PARSER::Parse()
switch( token )
{
case T_export: // The netlist starts here.
// nothing to do here,
// just increment the count of ')' to read and end of file
// nothing to do here, just increment the count of ')' to read at end of file
plevel++;
break;
@ -106,43 +104,43 @@ void KICAD_NETLIST_PARSER::Parse()
break;
case T_components: // The section comp starts here.
while( ( token = NextTok() ) != T_RIGHT )
while( ( token = NextTok() ) != T_EOF )
{
if( token == T_LEFT )
if( token == T_RIGHT )
break;
else if( token == T_LEFT )
token = NextTok();
if( token == T_comp ) // A component section found. Read it
if( token == T_comp ) // A component section found. Read it
parseComponent();
}
break;
case T_nets: // The section nets starts here.
while( ( token = NextTok() ) != T_RIGHT )
while( ( token = NextTok() ) != T_EOF )
{
if( token == T_LEFT )
if( token == T_RIGHT )
break;
else if( token == T_LEFT )
token = NextTok();
if( token == T_net )
{
// A net section if found. Read it
if( token == T_net ) // A net section if found. Read it
parseNet();
}
}
break;
case T_libparts: // The section libparts starts here.
while( ( token = NextTok() ) != T_RIGHT )
while( ( token = NextTok() ) != T_EOF )
{
if( token == T_LEFT )
if( token == T_RIGHT )
break;
else if( token == T_LEFT )
token = NextTok();
if( token == T_libpart )
{
// A libpart section if found. Read it
if( token == T_libpart ) // A libpart section if found. Read it
parseLibPartList();
}
}
break;
@ -159,7 +157,6 @@ void KICAD_NETLIST_PARSER::Parse()
break;
case T_RIGHT: // The closing parenthesis of the file.
// Not used (mainly they are comments), just skip it
plevel--;
break;
@ -194,9 +191,11 @@ void KICAD_NETLIST_PARSER::parseNet()
int nodecount = 0;
// The token net was read, so the next data is (code <number>)
while( (token = NextTok()) != T_RIGHT )
while( (token = NextTok()) != T_EOF )
{
if( token == T_LEFT )
if( token == T_RIGHT )
break;
else if( token == T_LEFT )
token = NextTok();
switch( token )
@ -218,9 +217,11 @@ void KICAD_NETLIST_PARSER::parseNet()
break;
case T_node:
while( (token = NextTok()) != T_RIGHT )
while( (token = NextTok()) != T_EOF )
{
if( token == T_LEFT )
if( token == T_RIGHT )
break;
else if( token == T_LEFT )
token = NextTok();
switch( token )
@ -348,7 +349,12 @@ void KICAD_NETLIST_PARSER::parseComponent()
break;
case T_sheetpath:
while( ( token = NextTok() ) != T_tstamps );
while( ( token = NextTok() ) != T_EOF )
{
if( token == T_tstamps )
break;
}
NeedSYMBOLorNUMBER();
pathtimestamp = FROM_UTF8( CurText() );
NeedRIGHT();