detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-29 17:40:01 +02:00
Code Issues Actions Packages Releases Activity

Merge pull request #226 from esrf-bliss/potential-generaldata-memory-leak

Browse Source 
slsReceiver: avoid potential memory leak: Implementation::generalData
This commit is contained in:
Dhanya Thattil 2020-12-04 14:15:12 +01:00 committed by GitHub
commit 8ddc407e62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsReceiverSoftware/src/Implementation.cpp
View File

@ -121,6 +121,9 @@ void Implementation::setDetectorType(const detectorType d) {
std::to_string(static_cast<int>(d))); std::to_string(static_cast<int>(d)));
} }
delete generalData;
generalData = nullptr;
// set detector specific variables // set detector specific variables
switch (myDetectorType) { switch (myDetectorType) {
case GOTTHARD: case GOTTHARD:

2
slsReceiverSoftware/src/Implementation.h
View File

@ -368,7 +368,7 @@ class Implementation : private virtual slsDetectorDefs {
void *pRawDataReady{nullptr}; void *pRawDataReady{nullptr};
// class objects // class objects
GeneralData *generalData; GeneralData *generalData{nullptr};
std::vector<std::unique_ptr<Listener>> listener; std::vector<std::unique_ptr<Listener>> listener;
std::vector<std::unique_ptr<DataProcessor>> dataProcessor; std::vector<std::unique_ptr<DataProcessor>> dataProcessor;
std::vector<std::unique_ptr<DataStreamer>> dataStreamer; std::vector<std::unique_ptr<DataStreamer>> dataStreamer;