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

Eeschema: connection_graph.cpp: clear old pointers to avoid using outdated or deleted data. 

m_connected_bus_item and m_connected_bus_items pointers were not cleared when
rebuilding connection data.
So in some cases these pointers were not updated, and created a crash
once the old data was no longer available (deleted)
This commit is contained in:
jean-pierre charras 2019-12-23 14:55:47 +01:00
parent 07d990f4f3
commit 034b87dec0
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eeschema/connection_graph.cpp
View File

@ -41,7 +41,6 @@
#include <connection_graph.h> #include <connection_graph.h>
bool CONNECTION_SUBGRAPH::ResolveDrivers( bool aCreateMarkers ) bool CONNECTION_SUBGRAPH::ResolveDrivers( bool aCreateMarkers )
{ {
int highest_priority = -1; int highest_priority = -1;
@ -503,11 +502,19 @@ void CONNECTION_GRAPH::updateItemConnectivity( SCH_SHEET_PATH aSheet,
case SCH_BUS_BUS_ENTRY_T: case SCH_BUS_BUS_ENTRY_T:
conn->SetType( CONNECTION_BUS ); conn->SetType( CONNECTION_BUS );
// clean previous (old) links:
static_cast<SCH_BUS_BUS_ENTRY*>( item )->m_connected_bus_items[0] = nullptr;
static_cast<SCH_BUS_BUS_ENTRY*>( item )->m_connected_bus_items[1] = nullptr;
break; break;
case SCH_PIN_T: case SCH_PIN_T:
conn->SetType( CONNECTION_NET );
break;
case SCH_BUS_WIRE_ENTRY_T: case SCH_BUS_WIRE_ENTRY_T:
conn->SetType( CONNECTION_NET ); conn->SetType( CONNECTION_NET );
// clean previous (old) link:
static_cast<SCH_BUS_WIRE_ENTRY*>( item )->m_connected_bus_item = nullptr;
break; break;
default: default:
@ -2016,9 +2023,12 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH
{ {
bus_wire = bus_entry->m_connected_bus_item; bus_wire = bus_entry->m_connected_bus_item;
wxASSERT( bus_wire->Type() == SCH_LINE_T );
// In some cases, the connection list (SCH_CONNECTION*) can be null. // In some cases, the connection list (SCH_CONNECTION*) can be null.
// Skip null connections. // Skip null connections.
if( bus_entry->Connection( sheet ) && bus_wire->Connection( sheet ) ) if( bus_entry->Connection( sheet ) && bus_wire->Type() == SCH_LINE_T
&& bus_wire->Connection( sheet ) )
{ {
conflict = true; conflict = true;