Skip to content

Fix a memory leak in the SIOReader #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmadlener merged 3 commits into from
Mar 2, 2026
Merged

Fix a memory leak in the SIOReader #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a640bec
Fix memory leak in SIOReader by deleting _currentEvent and _currentRun
jmcarcell Mar 2, 2026
f4f53c9
Use std::unique_ptr and define the destructor as default
jmcarcell Mar 2, 2026
8e562f0
Follow the rule of five, delete the move constructors and assignment
jmcarcell Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/cpp/include/SIO/SIOReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define SIO_SIOREADER_H 1

// -- std headers
#include <memory>
#include <set>

// -- lcio headers
Expand Down Expand Up @@ -36,11 +37,15 @@ namespace SIO {

/// no copy constructor
SIOReader(const SIOReader&) = delete ;
/// no assignment operator
/// no copy assignment operator
SIOReader& operator=(const SIOReader&) = delete ;
/// no move constructor
SIOReader(SIOReader&&) = delete ;
/// no move assignment operator
SIOReader& operator=(SIOReader&&) = delete ;

/// Destructor
virtual ~SIOReader() ;
virtual ~SIOReader() = default ;

/** Opens a list of files for reading (read-only). All subsequent
* read operations will operate on the list, i.e. if an EOF is encountered
Expand Down Expand Up @@ -210,9 +215,9 @@ namespace SIO {
/// The event listeners
std::set<IO::LCEventListener*> _evtListeners {} ;
/// pointer to current Event
EVENT::LCEvent* _currentEvent = nullptr ;
std::unique_ptr<EVENT::LCEvent> _currentEvent {} ;
/// pointer to current RunHeader
EVENT::LCRunHeader* _currentRun = nullptr ;
std::unique_ptr<EVENT::LCRunHeader> _currentRun {} ;

}; // class
} // namespace
Expand Down
42 changes: 8 additions & 34 deletions src/cpp/src/SIO/SIOReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ namespace SIO {

//----------------------------------------------------------------------------

SIOReader::~SIOReader() {
/* nop */
}

//----------------------------------------------------------------------------

void SIOReader::setReadCollectionNames(const std::vector<std::string>& colnames){
_reader.setReadCollectionNames( colnames ) ;
}
Expand Down Expand Up @@ -81,13 +75,8 @@ namespace SIO {
//----------------------------------------------------------------------------

EVENT::LCRunHeader* SIOReader::readNextRunHeader(int accessMode) {

if( _currentRun != nullptr ){
delete _currentRun ;
}
_currentRun = _reader.readNextRunHeader( accessMode ).release() ;

return _currentRun ;
_currentRun = _reader.readNextRunHeader( accessMode ) ;
return _currentRun.get() ;
}

//----------------------------------------------------------------------------
Expand All @@ -99,13 +88,8 @@ namespace SIO {
//----------------------------------------------------------------------------

EVENT::LCEvent* SIOReader::readNextEvent(int accessMode) {

if( _currentEvent != nullptr ){
delete _currentEvent ;
}
_currentEvent = _reader.readNextEvent( accessMode ).release() ;

return _currentEvent ;
_currentEvent = _reader.readNextEvent( accessMode ) ;
return _currentEvent.get() ;
}

//----------------------------------------------------------------------------
Expand All @@ -123,13 +107,8 @@ namespace SIO {
//----------------------------------------------------------------------------

EVENT::LCRunHeader * SIOReader::readRunHeader(int runNumber, int accessMode) {

if( _currentRun != nullptr ){
delete _currentRun ;
}
_currentRun = _reader.readRunHeader( runNumber, accessMode ).release() ;

return _currentRun ;
_currentRun = _reader.readRunHeader( runNumber, accessMode ) ;
return _currentRun.get() ;
}

//----------------------------------------------------------------------------
Expand All @@ -141,13 +120,8 @@ namespace SIO {
//----------------------------------------------------------------------------

EVENT::LCEvent * SIOReader::readEvent(int runNumber, int evtNumber, int accessMode) {

if( _currentEvent != nullptr ){
delete _currentEvent ;
}
_currentEvent = _reader.readEvent( runNumber, evtNumber, accessMode ).release() ;

return _currentEvent ;
_currentEvent = _reader.readEvent( runNumber, evtNumber, accessMode ) ;
return _currentEvent.get() ;
}

//----------------------------------------------------------------------------
Expand Down