Fix memory leak from double-allocation.
This commit is contained in:
parent
9a045af81f
commit
81117d2217
|
@ -124,8 +124,7 @@ bool PNS_LOG_FILE::parseCommonPnsProps( PNS::ITEM* aItem, const wxString& cmd,
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
PNS::SEGMENT* PNS_LOG_FILE::parsePnsSegmentFromString( PNS::SEGMENT* aSeg,
|
PNS::SEGMENT* PNS_LOG_FILE::parsePnsSegmentFromString( wxStringTokenizer& aTokens )
|
||||||
wxStringTokenizer& aTokens )
|
|
||||||
{
|
{
|
||||||
PNS::SEGMENT* seg = new PNS::SEGMENT();
|
PNS::SEGMENT* seg = new PNS::SEGMENT();
|
||||||
|
|
||||||
|
@ -151,7 +150,7 @@ PNS::SEGMENT* PNS_LOG_FILE::parsePnsSegmentFromString( PNS::SEGMENT* aSeg,
|
||||||
return seg;
|
return seg;
|
||||||
}
|
}
|
||||||
|
|
||||||
PNS::VIA* PNS_LOG_FILE::parsePnsViaFromString( PNS::VIA* aSeg, wxStringTokenizer& aTokens )
|
PNS::VIA* PNS_LOG_FILE::parsePnsViaFromString( wxStringTokenizer& aTokens )
|
||||||
{
|
{
|
||||||
PNS::VIA* via = new PNS::VIA();
|
PNS::VIA* via = new PNS::VIA();
|
||||||
|
|
||||||
|
@ -189,15 +188,9 @@ PNS::ITEM* PNS_LOG_FILE::parseItemFromString( wxStringTokenizer& aTokens )
|
||||||
wxString type = aTokens.GetNextToken();
|
wxString type = aTokens.GetNextToken();
|
||||||
|
|
||||||
if( type == wxS( "segment" ) )
|
if( type == wxS( "segment" ) )
|
||||||
{
|
return parsePnsSegmentFromString( aTokens );
|
||||||
PNS::SEGMENT* seg = new PNS::SEGMENT();
|
|
||||||
return parsePnsSegmentFromString( seg, aTokens );
|
|
||||||
}
|
|
||||||
else if( type == wxS( "via" ) )
|
else if( type == wxS( "via" ) )
|
||||||
{
|
return parsePnsViaFromString( aTokens );
|
||||||
PNS::VIA* seg = new PNS::VIA();
|
|
||||||
return parsePnsViaFromString( seg, aTokens );
|
|
||||||
}
|
|
||||||
|
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
|
@ -91,9 +91,9 @@ public:
|
||||||
private:
|
private:
|
||||||
bool parseCommonPnsProps( PNS::ITEM* aItem, const wxString& cmd, wxStringTokenizer& aTokens );
|
bool parseCommonPnsProps( PNS::ITEM* aItem, const wxString& cmd, wxStringTokenizer& aTokens );
|
||||||
|
|
||||||
PNS::SEGMENT* parsePnsSegmentFromString( PNS::SEGMENT* aSeg, wxStringTokenizer& aTokens );
|
PNS::SEGMENT* parsePnsSegmentFromString( wxStringTokenizer& aTokens );
|
||||||
|
|
||||||
PNS::VIA* parsePnsViaFromString( PNS::VIA* aSeg, wxStringTokenizer& aTokens );
|
PNS::VIA* parsePnsViaFromString( wxStringTokenizer& aTokens );
|
||||||
|
|
||||||
PNS::ITEM* parseItemFromString( wxStringTokenizer& aTokens );
|
PNS::ITEM* parseItemFromString( wxStringTokenizer& aTokens );
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue