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

Fix segfault when replacing an existing component in a library.

This commit is contained in:
Wayne Stambaugh 2010-10-12 16:44:39 -04:00
parent b1ffd179d1
commit e8bb7d1ef5
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eeschema/class_library.cpp
View File

@ -344,18 +344,24 @@ LIB_COMPONENT* CMP_LIBRARY::ReplaceComponent( LIB_COMPONENT* aOldComponent,
wxASSERT( aNewComponent != NULL ); wxASSERT( aNewComponent != NULL );
wxASSERT( aOldComponent->GetName().CmpNoCase( aNewComponent->GetName() )== 0 ); wxASSERT( aOldComponent->GetName().CmpNoCase( aNewComponent->GetName() )== 0 );
/* Remove the old root component. The component will automatically be removed when all /* Remove the old root component. The component will automatically be deleted
* it's aliases are deleted. * when all it's aliases are deleted. Do not place any code that accesses
* aOldComponent inside this loop that gets evaluated after the last alias is
* removed in RemoveEntry(). Failure to heed this warning will result in a
* segfault.
*/ */
BOOST_FOREACH( LIB_ALIAS* alias, aOldComponent->m_aliases ) size_t i = aOldComponent->m_aliases.size();
while( i != 0 )
{ {
RemoveEntry( (CMP_LIB_ENTRY*) alias ); i -= 1;
RemoveEntry( (CMP_LIB_ENTRY*) aOldComponent->m_aliases[ i ] );
} }
LIB_COMPONENT* newCmp = new LIB_COMPONENT( *aNewComponent, this ); LIB_COMPONENT* newCmp = new LIB_COMPONENT( *aNewComponent, this );
// Add new aliases to library alias map. // Add new aliases to library alias map.
for( size_t i = 0; i < newCmp->m_aliases.size(); i++ ) for( i = 0; i < newCmp->m_aliases.size(); i++ )
{ {
aliases[ newCmp->m_aliases[ i ]->GetName() ] = newCmp->m_aliases[ i ]; aliases[ newCmp->m_aliases[ i ]->GetName() ] = newCmp->m_aliases[ i ];
} }