system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-23 19:15:55 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix null deref in contextSwitch().

Browse source
This commit is contained in:
Andreas Kling 2018-10-21 21:57:43 +02:00
parent 2f99ff801e
commit dd6706a1a1
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Kernel/Task.cpp
View file

@ -360,14 +360,17 @@ static bool contextSwitch(Task* t)
if (current == t)
return false;
// If the last task hasn't blocked (still marked as running),
// mark it as runnable for the next round.
if (current->state() == Task::Running)
current->setState(Task::Runnable);
if (current) {
// If the last task hasn't blocked (still marked as running),
// mark it as runnable for the next round.
if (current->state() == Task::Running)
current->setState(Task::Runnable);
bool success = MemoryManager::the().unmapRegionsForTask(*current);
ASSERT(success);
success = MemoryManager::the().mapRegionsForTask(*t);
bool success = MemoryManager::the().unmapRegionsForTask(*current);
ASSERT(success);
}
bool success = MemoryManager::the().mapRegionsForTask(*t);
ASSERT(success);
current = t;