BRL-CAD/stepcode
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed memory leaks for STEPcomplex attribute data.

Browse Source 
* STEPcomplex creates attribute data in BuildAttrs method that never
  got destroyed.
This commit is contained in:
davyw
2012-04-05 20:40:15 +02:00
parent 6b1ba4aa5d
commit dd6ef88aa1
2 changed files with 56 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/clstepcore/STEPcomplex.cc
+50 -11
View File
@@ -156,9 +156,17 @@ void STEPcomplex::Initialize( const char ** names, const char * schnm ) {
}
STEPcomplex::~STEPcomplex() {
STEPcomplex_attr_data attr_data;
if( sc ) {
delete sc;
}
for ( attr_data = _attr_data_list.begin();
attr_data != _attr_data_list.end();
attr_data ++ ) {
delete *attr_data;
}
_attr_data_list.clear();
}
void STEPcomplex::AssignDerives() {
@@ -422,11 +430,22 @@ Severity STEPcomplex::STEPread( int id, int addFileId, class InstMgr * instance_
#endif
void STEPcomplex::BuildAttrs( const char * s ) {
// assign inherited member variable
eDesc = ( class EntityDescriptor * )_registry->FindEntity( s );
if( eDesc ) {
const AttrDescriptorList * attrList;
SDAI_Integer *integer_data;
SDAI_String *string_data;
SDAI_Binary *binary_data;
SDAI_Real *real_data;
SDAI_BOOLEAN *boolean_data;
SDAI_LOGICAL *logical_data;
SDAI_Application_instance **entity_data;
SDAI_Enum *enum_data;
SDAI_Select *select_data;
STEPaggregate *aggr_data;
attrList = &( eDesc->ExplicitAttr() );
//////////////////////////////////////////////
@@ -443,45 +462,62 @@ void STEPcomplex::BuildAttrs( const char * s ) {
switch( ad->NonRefType() ) {
case INTEGER_TYPE:
a = new STEPattribute( *ad, new SDAI_Integer );
integer_data = new SDAI_Integer;
_attr_data_list.push_back( ( void * ) integer_data );
a = new STEPattribute( *ad, integer_data );
break;
case STRING_TYPE:
a = new STEPattribute( *ad, new SDAI_String );
string_data = new SDAI_String;
_attr_data_list.push_back( ( void * ) string_data );
a = new STEPattribute( *ad, string_data );
break;
case BINARY_TYPE:
a = new STEPattribute( *ad, new SDAI_Binary );
binary_data = new SDAI_Binary;
_attr_data_list.push_back( ( void * ) binary_data );
a = new STEPattribute( *ad, binary_data );
break;
case REAL_TYPE:
case NUMBER_TYPE:
a = new STEPattribute( *ad, new SDAI_Real );
real_data = new SDAI_Real;
_attr_data_list.push_back( ( void * ) real_data );
a = new STEPattribute( *ad, real_data );
break;
case BOOLEAN_TYPE:
a = new STEPattribute( *ad, new SDAI_BOOLEAN );
boolean_data = new SDAI_BOOLEAN;
_attr_data_list.push_back( ( void * ) boolean_data );
a = new STEPattribute( *ad, boolean_data );
break;
case LOGICAL_TYPE:
a = new STEPattribute( *ad, new SDAI_LOGICAL );
logical_data = new SDAI_LOGICAL;
_attr_data_list.push_back( ( void * ) logical_data );
a = new STEPattribute( *ad, logical_data );
break;
case ENTITY_TYPE:
a = new STEPattribute( *ad,
new( SDAI_Application_instance * ) );
entity_data = new ( SDAI_Application_instance * );
_attr_data_list.push_back( ( void * ) entity_data );
a = new STEPattribute( *ad, entity_data );
break;
case ENUM_TYPE: {
EnumTypeDescriptor * enumD =
( EnumTypeDescriptor * )ad->ReferentType();
a = new STEPattribute( *ad, enumD->CreateEnum() );
enum_data = enumD->CreateEnum();
_attr_data_list.push_back( ( void * ) enum_data );
a = new STEPattribute( *ad, enum_data );
break;
}
case SELECT_TYPE: {
SelectTypeDescriptor * selectD =
( SelectTypeDescriptor * )ad->ReferentType();
a = new STEPattribute( *ad, selectD->CreateSelect() );
select_data = selectD->CreateSelect();
_attr_data_list.push_back( ( void * ) select_data );
a = new STEPattribute( *ad, select_data );
break;
}
case AGGREGATE_TYPE:
@@ -491,7 +527,10 @@ void STEPcomplex::BuildAttrs( const char * s ) {
case LIST_TYPE: { // DAS
AggrTypeDescriptor * aggrD =
( AggrTypeDescriptor * )ad->ReferentType();
a = new STEPattribute( *ad, aggrD->CreateAggregate() );
aggr_data = aggrD->CreateAggregate();
//_attr_data_list.push_back( ( void * ) aggr_data );
_attr_data_list.push_back( aggr_data );
a = new STEPattribute( *ad, aggr_data );
break;
}
default:
src/clstepcore/STEPcomplex.h
+6 -1
View File
@@ -8,13 +8,18 @@
#include <ExpDict.h>
#include <Registry.h>
#include <list>
typedef std::list<void*> STEPcomplex_attr_data_list;
typedef std::list<void*>::iterator STEPcomplex_attr_data;
class SCL_CORE_EXPORT STEPcomplex : public SDAI_Application_instance {
public:
STEPcomplex * sc;
STEPcomplex * head;
Registry * _registry;
int visited; ///< used when reading (or as you wish?)
STEPcomplex_attr_data_list _attr_data_list;
public:
STEPcomplex( Registry * registry, int fileid );
STEPcomplex( Registry * registry, const std::string ** names, int fileid,