Use array deletes, clean up temporary objects.

starseeker · cshorler · commit c7bd9fa9956e · 2022-06-11T20:14:25.000+01:00
diff --git a/src/cldai/sdaiEntity_extent_set.cc b/src/cldai/sdaiEntity_extent_set.cc
@@ -51,7 +51,7 @@ SDAI_Entity_extent__set::SDAI_Entity_extent__set( int defaultSize ) {
 }
 
 SDAI_Entity_extent__set::~SDAI_Entity_extent__set() {
-    delete _buf;
+    delete[] _buf;
 }
 
 void SDAI_Entity_extent__set::Check( int index ) {
@@ -62,7 +62,7 @@ void SDAI_Entity_extent__set::Check( int index ) {
         _bufsize = ( index + 1 ) * 2;
         newbuf = new SDAI_Entity_extent_ptr[_bufsize];
         memmove( newbuf, _buf, _count * sizeof( SDAI_Entity_extent_ptr ) );
-        delete _buf;
+        delete[] _buf;
         _buf = newbuf;
     }
 }
diff --git a/src/cleditor/STEPfile.cc b/src/cleditor/STEPfile.cc
@@ -851,6 +851,8 @@ SDAI_Application_instance * STEPfile::CreateInstance( istream & in, ostream & ou
                 << " User Defined Entity in DATA section ignored.\n"
                 << "\tData lost: \'!" << objnm << "\': " << tmpbuf
                 << endl;
+	    if (scopelist)
+               delete[] scopelist;
             return ENTITY_NULL;
         } else {
             schnm = schemaName();
@@ -879,6 +881,8 @@ SDAI_Application_instance * STEPfile::CreateInstance( istream & in, ostream & ou
         out << "ERROR: instance #" << fileid << " \'" << objnm
             << "\': " << result.UserMsg()
             << ".\n\tData lost: " << tmpbuf << "\n\n";
+        if (scopelist)
+           delete[] scopelist;
         return ENTITY_NULL;
     }
     obj -> STEPfile_id = fileid;
@@ -887,6 +891,10 @@ SDAI_Application_instance * STEPfile::CreateInstance( istream & in, ostream & ou
     SkipInstance( in, tmpbuf );
 
     ReadTokenSeparator( in );
+
+    if (scopelist)
+       delete[] scopelist;
+
     return obj;
 }
 
@@ -1531,9 +1539,11 @@ void STEPfile::WriteHeaderInstance( SDAI_Application_instance * obj, ostream & o
 void STEPfile::WriteHeaderInstanceFileName( ostream & out ) {
 // Get the FileName instance from _headerInstances
     SDAI_Application_instance * se = 0;
+    bool del_se = false;
     se = _headerInstances->GetApplication_instance( "File_Name" );
     if( se == ENTITY_NULL ) {
         se = ( SDAI_Application_instance * )HeaderDefaultFileName();
+	del_se = true;
     }
 
 //set some of the attribute values at time of output
@@ -1553,6 +1563,9 @@ void STEPfile::WriteHeaderInstanceFileName( ostream & out ) {
 
 //output the values to the file
     WriteHeaderInstance( se, out );
+
+    if (del_se)
+       delete se;
 }
 
 void STEPfile::WriteHeaderInstanceFileDescription( ostream & out ) {
@@ -1563,8 +1576,11 @@ void STEPfile::WriteHeaderInstanceFileDescription( ostream & out ) {
         // ERROR: no File_Name instance in _headerInstances
         // create a File_Name instance
         se = ( SDAI_Application_instance * )HeaderDefaultFileDescription();
+	WriteHeaderInstance(se, out);
+	delete se;
+    } else {
+        WriteHeaderInstance( se, out );
     }
-    WriteHeaderInstance( se, out );
 }
 
 void STEPfile::WriteHeaderInstanceFileSchema( ostream & out ) {
@@ -1575,8 +1591,11 @@ void STEPfile::WriteHeaderInstanceFileSchema( ostream & out ) {
         // ERROR: no File_Name instance in _headerInstances
         // create a File_Name instance
         se = ( SDAI_Application_instance * ) HeaderDefaultFileSchema();
+        WriteHeaderInstance( se, out );
+	delete se;
+    } else {
+        WriteHeaderInstance( se, out );
     }
-    WriteHeaderInstance( se, out );
 }
 
 void STEPfile::WriteData( ostream & out, int writeComments ) {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ SDAI_Entity_extent__set::SDAI_Entity_extent__set( int defaultSize ) {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`SDAI_Entity_extent__set::~SDAI_Entity_extent__set() {`
`54`		`- delete _buf;`
	`54`	`+ delete[] _buf;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`void SDAI_Entity_extent__set::Check( int index ) {`
`@@ -62,7 +62,7 @@ void SDAI_Entity_extent__set::Check( int index ) {`
`62`	`62`	`_bufsize = ( index + 1 ) * 2;`
`63`	`63`	`newbuf = new SDAI_Entity_extent_ptr[_bufsize];`
`64`	`64`	`memmove( newbuf, _buf, _count * sizeof( SDAI_Entity_extent_ptr ) );`
`65`		`- delete _buf;`
	`65`	`+ delete[] _buf;`
`66`	`66`	`_buf = newbuf;`
`67`	`67`	`}`
`68`	`68`	`}`