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

DSN_LEXER underneath PCB_PARSER does not own the LINE_READER it receives, fix memory leak

This commit is contained in:
Dick Hollenbeck 2012-10-24 12:38:10 -05:00
parent 1e772280b9
commit 484eb55ae8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcbnew/kicad_plugin.cpp
View File

@ -240,7 +240,8 @@ void FP_CACHE::Load()
} }
// reader now owns fp, will close on exception or return // reader now owns fp, will close on exception or return
PCB_PARSER parser( new FILE_LINE_READER( fp, fpFileName ) ); FILE_LINE_READER reader( fp, fpFileName );
PCB_PARSER parser( &reader );
std::string name = TO_UTF8( fpFileName ); std::string name = TO_UTF8( fpFileName );
@ -1493,12 +1494,12 @@ BOARD* PCB_IO::Load( const wxString& aFileName, BOARD* aAppendToMe, PROPERTIES*
if( !file.IsOpened() ) if( !file.IsOpened() )
{ {
wxString msg; wxString msg = wxString::Format( _( "Unable to read file \"%s\"" ), GetChars( aFileName ) );
msg.Printf( _( "Unable to read file \"%s\"" ), GetChars( aFileName ) );
THROW_IO_ERROR( msg ); THROW_IO_ERROR( msg );
} }
PCB_PARSER parser( new FILE_LINE_READER( file.fp(), aFileName ), aAppendToMe ); FILE_LINE_READER reader( file.fp(), aFileName );
PCB_PARSER parser( &reader, aAppendToMe );
BOARD* board = dynamic_cast<BOARD*>( parser.Parse() ); BOARD* board = dynamic_cast<BOARD*>( parser.Parse() );
wxASSERT( board ); wxASSERT( board );