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

Prevent invalid decrement in tool manager 

Iterating over the tool stack, we potentially remove the current
iterator.  If this removal happens at the beginning of the toolstack, we
cannot decrement the iterator to a position before the stack without
creating an invalid state.
This commit is contained in:
Seth Hillbrand 2020-04-20 11:49:25 -07:00
parent 94e2690fed
commit 1770a1ea21
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/tool/tool_manager.cpp
View File

@ -648,16 +648,22 @@ bool TOOL_MANAGER::dispatchInternal( const TOOL_EVENT& aEvent )
wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER::dispatchInternal %s", aEvent.Format() ); wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER::dispatchInternal %s", aEvent.Format() );
auto it = m_activeTools.begin();
// iterate over active tool stack // iterate over active tool stack
for( auto it = m_activeTools.begin(); it != m_activeTools.end(); ++it ) while( it != m_activeTools.end() )
{ {
TOOL_STATE* st = m_toolIdIndex[*it]; TOOL_STATE* st = m_toolIdIndex[*it];
bool increment = true;
// forward context menu events to the tool that created the menu // forward context menu events to the tool that created the menu
if( aEvent.IsChoiceMenu() ) if( aEvent.IsChoiceMenu() )
{ {
if( *it != m_menuOwner ) if( *it != m_menuOwner )
{
++it;
continue; continue;
}
} }
// the tool state handler is waiting for events (i.e. called Wait() method) // the tool state handler is waiting for events (i.e. called Wait() method)
@ -685,7 +691,7 @@ bool TOOL_MANAGER::dispatchInternal( const TOOL_EVENT& aEvent )
if( end ) if( end )
{ {
it = finishTool( st ); it = finishTool( st );
--it; increment = false;
} }
} }
@ -701,6 +707,9 @@ bool TOOL_MANAGER::dispatchInternal( const TOOL_EVENT& aEvent )
} }
} }
} }
if( increment )
++it;
} }
for( auto& state : m_toolState ) for( auto& state : m_toolState )