Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 16:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Throw an error if shmem receives invalid meta data

Browse Source
This commit is contained in:
Alexey Rybalchenko 2020-03-09 13:26:27 +01:00 committed by Dennis Klein
parent a545bee3b1
commit 0ae53fd7d9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fairmq/shmem/Socket.cxx
View File

@ -183,7 +183,9 @@ int Socket::Receive(MessagePtr& msg, const int timeout)
int nbytes = zmq_msg_recv(zmqMsg.Msg(), fSocket, flags); int nbytes = zmq_msg_recv(zmqMsg.Msg(), fSocket, flags);
if (nbytes > 0) { if (nbytes > 0) {
// check for number of received messages. must be 1 // check for number of received messages. must be 1
assert((nbytes / sizeof(MetaHeader)) == 1); if (nbytes != sizeof(MetaHeader)) {
throw SocketError("Received message is not a valid FairMQ shared memory message. Possibly due to a misconfigured transport on the sender side.");
}
MetaHeader* hdr = static_cast<MetaHeader*>(zmqMsg.Data()); MetaHeader* hdr = static_cast<MetaHeader*>(zmqMsg.Data());
size_t size = hdr->fSize; size_t size = hdr->fSize;
@ -297,11 +299,13 @@ int64_t Socket::Receive(vector<MessagePtr>& msgVec, const int timeout)
if (nbytes > 0) { if (nbytes > 0) {
MetaHeader* hdrVec = static_cast<MetaHeader*>(zmqMsg.Data()); MetaHeader* hdrVec = static_cast<MetaHeader*>(zmqMsg.Data());
const auto hdrVecSize = zmqMsg.Size(); const auto hdrVecSize = zmqMsg.Size();
assert(hdrVecSize > 0); assert(hdrVecSize > 0);
assert(hdrVecSize % sizeof(MetaHeader) == 0); if (hdrVecSize % sizeof(MetaHeader) != 0) {
throw SocketError("Received message is not a valid FairMQ shared memory message. Possibly due to a misconfigured transport on the sender side.");
}
const auto numMessages = hdrVecSize / sizeof(MetaHeader); const auto numMessages = hdrVecSize / sizeof(MetaHeader);
msgVec.reserve(numMessages); msgVec.reserve(numMessages);
for (size_t m = 0; m < numMessages; m++) { for (size_t m = 0; m < numMessages; m++) {