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

no check for null when deleting

Browse Source
This commit is contained in:
Erik Frojdh
2019-05-14 17:09:24 +02:00
parent 29be6f3b34
commit 74d67261a9
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/src/slsDetectorCommand.cpp
View File

@ -3439,7 +3439,7 @@ std::string slsDetectorCommand::cmdDetectorSize(int narg, char *args[], int acti
ret = myDet->setDynamicRange(val, detPos); ret = myDet->setDynamicRange(val, detPos);
} else if (cmd == "roi") { } else if (cmd == "roi") {
const ROI* r = myDet->getROI(ret, detPos); const ROI* r = myDet->getROI(ret, detPos);
if (r != NULL)
delete [] r; delete [] r;
} else if (cmd == "detsizechan") { } else if (cmd == "detsizechan") {
sprintf(ans, "%d %d", myDet->getMaxNumberOfChannelsPerDetector(X), myDet->getMaxNumberOfChannelsPerDetector(Y)); sprintf(ans, "%d %d", myDet->getMaxNumberOfChannelsPerDetector(X), myDet->getMaxNumberOfChannelsPerDetector(Y));

2
slsReceiverSoftware/src/DataStreamer.cpp
View File

@ -46,7 +46,7 @@ DataStreamer::DataStreamer(int ind, Fifo* f, uint32_t* dr, std::vector<ROI>* r,
DataStreamer::~DataStreamer() { DataStreamer::~DataStreamer() {
CloseZmqSocket(); CloseZmqSocket();
if (completeBuffer) delete [] completeBuffer; delete [] completeBuffer;
ThreadObject::DestroyThread(); ThreadObject::DestroyThread();
} }

4
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -28,9 +28,9 @@ slsReceiverTCPIPInterface::~slsReceiverTCPIPInterface() {
delete mySock; delete mySock;
mySock=nullptr; mySock=nullptr;
} }
if (interface)
delete interface; delete interface;
if(receiver)
delete receiver; delete receiver;
} }