summaryrefslogtreecommitdiff
path: root/src/common/tree.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-05-15 22:30:21 -0700
committerGitHub <noreply@github.com>2021-05-15 22:30:21 -0700
commit5a2b15bf75318987d773a2bc69bd6224a28b7939 (patch)
treef213f5b011410022e8e98f7c3905d16d575ed413 /src/common/tree.h
parenta1138028a82d61f2cad2305686bf720966fabef9 (diff)
parenteee302b9b9feb325d5444eace51266d238b8e0b3 (diff)
Merge pull request #6299 from bunnei/ipc-improvements
Various improvements to IPC and session management
Diffstat (limited to 'src/common/tree.h')
-rw-r--r--src/common/tree.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/tree.h b/src/common/tree.h
index 3da49e422..9d2d0df4e 100644
--- a/src/common/tree.h
+++ b/src/common/tree.h
@@ -322,7 +322,7 @@ void RB_INSERT_COLOR(RBHead<Node>* head, Node* elm) {
template <typename Node>
void RB_REMOVE_COLOR(RBHead<Node>* head, Node* parent, Node* elm) {
Node* tmp;
- while ((elm == nullptr || RB_IS_BLACK(elm)) && elm != head->Root()) {
+ while ((elm == nullptr || RB_IS_BLACK(elm)) && elm != head->Root() && parent != nullptr) {
if (RB_LEFT(parent) == elm) {
tmp = RB_RIGHT(parent);
if (RB_IS_RED(tmp)) {