Shared/LinkedList: Fix delink logic to handle first and last elements…

… in linked list
walkline · Jan 10, 2025 · 6f35458 · 6f35458
1 parent d8240fb
commit 6f35458
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/server/shared/Dynamic/LinkedList.h b/src/server/shared/Dynamic/LinkedList.h
@@ -37,7 +37,7 @@ class LinkedListElement
 
         bool hasNext() const  { return (iNext && iNext->iNext != nullptr); }
         bool hasPrev() const  { return (iPrev && iPrev->iPrev != nullptr); }
-        bool isInList() const { return (iNext != nullptr && iPrev != nullptr); }
+        bool isInList() const { return (iNext != nullptr || iPrev != nullptr); }
 
         LinkedListElement      * next()       { return hasNext() ? iNext : nullptr; }
         LinkedListElement const* next() const { return hasNext() ? iNext : nullptr; }
@@ -54,8 +54,11 @@ class LinkedListElement
             if (!isInList())
                 return;
 
-            iNext->iPrev = iPrev;
-            iPrev->iNext = iNext;
+            if (iNext)
+                iNext->iPrev = iPrev;
+            if (iPrev)
+                iPrev->iNext = iNext;
+
             iNext = nullptr;
             iPrev = nullptr;
         }