From eb57103c06e3c6461661573e983c060fcd288541 Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <rnozdrin@mariadb.com>
Date: Wed, 31 Aug 2022 18:55:48 +0000
Subject: [PATCH] This patch fixes nullptr dereferencing in the same node queue
 thread

---
 primitives/primproc/primitiveserver.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/primitives/primproc/primitiveserver.cpp b/primitives/primproc/primitiveserver.cpp
index a280c4369..064d326f4 100644
--- a/primitives/primproc/primitiveserver.cpp
+++ b/primitives/primproc/primitiveserver.cpp
@@ -2359,11 +2359,11 @@ void PrimitiveServer::start(Service* service, utils::USpaceSpinLock& startupRace
       [this]()
       {
         utils::setThreadName("PPSHServerThr");
-        auto* exeMgrDecPtr = exemgr::globServiceExeMgr->getDec();
+        auto* exeMgrDecPtr = (exemgr::globServiceExeMgr) ? exemgr::globServiceExeMgr->getDec() : nullptr;
         while (!exeMgrDecPtr)
         {
           sleep(1);
-          exeMgrDecPtr = exemgr::globServiceExeMgr->getDec();
+          exeMgrDecPtr = (exemgr::globServiceExeMgr) ? exemgr::globServiceExeMgr->getDec() : nullptr;
         }
         // These empty SPs have "same-host" messaging semantics.
         SP_UM_IOSOCK outIos(nullptr);