Commit 028b0bd3 authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Fix board parsing error when module name is empty. (fixes lp:1226546)

parent 0224bc2f

pcbnew/pcb_parser.cpp

+6 −4
Original line number Diff line number Diff line
@@ -1540,6 +1540,7 @@ MODULE* PCB_PARSER::parseMODULE( wxArrayString* aInitialComments ) throw( IO_ERR 
    wxCHECK_MSG( CurTok() == T_module, NULL,

                 wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as MODULE." ) );



    wxString name;

    wxPoint  pt;

    T        token;

    FPID     fpid;
@@ -1549,8 +1550,9 @@ MODULE* PCB_PARSER::parseMODULE( wxArrayString* aInitialComments ) throw( IO_ERR 
    module->SetInitialComments( aInitialComments );



    NeedSYMBOLorNUMBER();

    name = FromUTF8();



    if( fpid.Parse( FromUTF8() ) >= 0 )

    if( !name.IsEmpty() && fpid.Parse( FromUTF8() ) >= 0 )

    {

        wxString error;

        error.Printf( _( "invalid PFID in\nfile: <%s>\nline: %d\noffset: %d" ),