mirror/nzbget
1
0
Fork 0
mirror of https://github.com/nzbget/nzbget.git synced 2026-04-25 15:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

#148: fixed crash in queue script handling

Browse Source 
If multiple queue scripts were queued and the nzb-file was deleted
before all scripts were executed the program may crash.
This commit is contained in:
Andrey Prygunkov
2016-05-29 16:02:40 +02:00
parent 6f7be71a93
commit 92ae10e338
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
daemon/extension/QueueScript.cpp
View File

@@ -416,7 +416,7 @@ void QueueScriptCoordinator::CheckQueue()
Guard guard(m_queueMutex);
NzbInfo* curNzbInfo = nullptr;
Queue::iterator itCurItem = m_queue.end();
Queue::iterator itCurItem;
for (Queue::iterator it = m_queue.begin(); it != m_queue.end(); )
{
@@ -430,6 +430,12 @@ void QueueScriptCoordinator::CheckQueue()
nzbInfo->GetMarkStatus() == NzbInfo::ksBad)
{
it = m_queue.erase(it);
if (curNzbInfo)
{
// process from the beginning, while "erase" invalidated "itCurItem"
curNzbInfo = nullptr;
it = m_queue.begin();
}
continue;
}
@@ -442,7 +448,7 @@ void QueueScriptCoordinator::CheckQueue()
it++;
}
if (itCurItem != m_queue.end())
if (curNzbInfo)
{
m_curItem = std::move(*itCurItem);
m_queue.erase(itCurItem);