darlinghq/darlingserver
1
0
Fork 0
mirror of https://github.com/darlinghq/darlingserver.git synced 2024-11-26 22:00:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't allowed saved replies to be overwritten

Browse Source
This commit is contained in:
Ariel Abreu 2022-06-24 01:36:56 -04:00
parent 89a7a10d41
commit 700d89812c
No known key found for this signature in database
GPG Key ID: D67AE16CCEA85B70
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/thread.cpp
View File

@ -724,7 +724,7 @@ void DarlingServer::Thread::syscallReturn(int resultCode) {
}
while (true) {
currentThreadVar->suspend();
currentThreadVar->suspend();
threadLog.error() << "Thread was resumed after syscall without changing running context" << threadLog.endLog;
}
@ -1316,6 +1316,10 @@ void DarlingServer::Thread::pushCallReply(std::shared_ptr<Call> expectedCall, Me
}
if (_interruptedForSignal) {
if (_interrupts.top().savedReply) {
throw std::runtime_error("New reply would overwrite existing saved reply");
}
_interrupts.top().savedReply = std::move(reply);
} else if (_deferReplyForS2C) {
_deferredReply = std::move(reply);
@ -1466,6 +1470,10 @@ void DarlingServer::Thread::_handleInterruptEnterForCurrentThread() {
std::unique_lock lock(currentThreadVar->_rwlock);
if (currentThreadVar->_pendingSavedReply) {
if (currentThreadVar->_interrupts.top().savedReply) {
throw std::runtime_error("Pending saved reply would overwrite saved reply");
}
currentThreadVar->_interrupts.top().savedReply = std::move(*currentThreadVar->_pendingSavedReply);
currentThreadVar->_pendingSavedReply = std::nullopt;
}