From f42dc949f7a3e0872190db0deffad4d2c0cc1478 Mon Sep 17 00:00:00 2001 From: Luke Usher Date: Fri, 10 Feb 2017 08:21:00 +0000 Subject: [PATCH] Fix a potential null pointer dereference --- src/CxbxKrnl/EmuKrnlKe.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/CxbxKrnl/EmuKrnlKe.cpp b/src/CxbxKrnl/EmuKrnlKe.cpp index a49c34128..c4e57c479 100644 --- a/src/CxbxKrnl/EmuKrnlKe.cpp +++ b/src/CxbxKrnl/EmuKrnlKe.cpp @@ -111,8 +111,13 @@ void RemoveEntryList(xboxkrnl::PLIST_ENTRY pEntry) xboxkrnl::PLIST_ENTRY _EX_Flink = pEntry->Flink; xboxkrnl::PLIST_ENTRY _EX_Blink = pEntry->Blink; - _EX_Blink->Flink = _EX_Flink; - _EX_Flink->Blink = _EX_Blink; + if (_EX_Flink != nullptr) { + _EX_Blink->Flink = _EX_Flink; + } + + if (_EX_Flink != nullptr) { + _EX_Flink->Blink = _EX_Blink; + } } xboxkrnl::PLIST_ENTRY RemoveHeadList(xboxkrnl::PLIST_ENTRY pListHead)