Merge branch 'overlay-memleak-fix' into '21.0'

IDC_OverlayBase: Fix memory leaks when merging containers

See merge request !963

Former-commit-id: 5781b12c

Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayCommon.icc

@@ -65,6 +65,7 @@ std::cout<<"start overlayContainer"<<std::endl;
    
    if ( outputContainer->addCollection(coll_data, p_data.hashId()).isFailure() ) {
       parent->msg(MSG::WARNING) <<"add data Collection failed for output "<< p_data.hashId()<<endmsg; //" collectionNo "<<collectionNo<<endmsg; 
+      delete coll_data;
       }
    }     
 
@@ -94,16 +95,19 @@ std::cout<<"start overlayContainer"<<std::endl;
       outputContainer->removeCollection(p_ovl.hashId());
       if (outputContainer->addCollection(out_coll, p_ovl.hashId()).isFailure() ) {
 	parent->msg(MSG::WARNING) << "overlay addCollection failed " << endreq; 
+        delete out_coll;
       }
-
+      delete coll_data;
+      delete coll_ovl;
       }
     else {
       /** Copy the complete collection from ovl to output, 
           hopefully preserving the "most derived" type of its raw data */ 
        if ( outputContainer->addCollection(coll_ovl, coll_id).isFailure() ) {
         	parent->msg(MSG::WARNING) << "add mc Collection failed " << endreq; 
+           delete coll_ovl;
       }
-  
+      delete out_coll;
   }
    }
 
@@ -146,6 +150,7 @@ std::cout<<"start overlayContainer"<<std::endl;
    if ( outputContainer->addCollection(coll_data, p_data.hashId()).isFailure() ) {
      parent->msg(MSG::WARNING) <<"add data Collection failed for output "<< p_data.hashId()<<endmsg; 
       }
+      delete coll_data;
    }     
 
    /** Add data from the ovl container to the output one */
@@ -179,15 +184,19 @@ std::cout<<"start overlayContainer"<<std::endl;
       outputContainer->removeCollection(p_ovl.hashId());
       if (outputContainer->addCollection(out_coll, p_ovl.hashId()).isFailure() ) {
 	parent->msg(MSG::WARNING) << "overlay addCollection failed " << endreq; 
+        delete out_coll;
       }
-
+      delete coll_data;
+      delete coll_ovl;
       }
     else {
       /** Copy the complete collection from ovl to output, 
           hopefully preserving the "most derived" type of its raw data */ 
        if ( outputContainer->addCollection(coll_ovl, coll_id).isFailure() ) {
         parent->msg(MSG::WARNING) << "add mc Collection failed " << endreq; 
+        delete coll_ovl;
       }  
+      delete out_coll;
     }   
    }
   }