KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

Added some precautions in DHB::replyToReply

Browse Source
This commit is contained in:
Steffen Gaisser 2021-06-15 15:33:52 +02:00
parent fbbc640f4d
commit 0cde65f5a1
Signed by: gaisser
GPG Key ID: 83D8D0FE95C319A6
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devicehandlers/DeviceHandlerBase.cpp
View File

@ -591,9 +591,20 @@ void DeviceHandlerBase::replyToReply(const DeviceCommandId_t command, DeviceRepl
//Is most likely periodic reply. Silent return. //Is most likely periodic reply. Silent return.
return; return;
} }
// Check if more replies are expected. If so, do nothing.
DeviceCommandInfo* info = &replyInfo.command->second; DeviceCommandInfo* info = &replyInfo.command->second;
if (--info->expectedReplies == 0) { if (info == nullptr){
printWarningOrError(sif::OutputTypes::OUT_ERROR,
"replyToReply", HasReturnvaluesIF::RETURN_FAILED,
"Command pointer not found");
return;
}
if (info->expectedReplies > 0){
// Check before to avoid underflow
info->expectedReplies--;
}
// Check if more replies are expected. If so, do nothing.
if (info->expectedReplies == 0) {
// Check if it was transition or internal command. // Check if it was transition or internal command.
// Don't send any replies in that case. // Don't send any replies in that case.
if (info->sendReplyTo != NO_COMMANDER) { if (info->sendReplyTo != NO_COMMANDER) {