From fbcdf5c9b0c4eda7f15e9b01c740aaf7bbfed116 Mon Sep 17 00:00:00 2001
From: Spencer Sevilla <spencer.builds.networks@gmail.com>
Date: Tue, 23 Jan 2024 10:52:50 -0800
Subject: [PATCH] need to check mme_ue context before proceedingwith esm state
 machine

---
 src/mme/emm-sm.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/mme/emm-sm.c b/src/mme/emm-sm.c
index 0ce1854cd6..4c1c2e804d 100644
--- a/src/mme/emm-sm.c
+++ b/src/mme/emm-sm.c
@@ -66,6 +66,12 @@ void emm_state_de_registered(ogs_fsm_t *s, mme_event_t *e)
     mme_ue = e->mme_ue;
     ogs_assert(mme_ue);
 
+    mme_ue = mme_ue_cycle(mme_ue);
+    if (!mme_ue) {
+        ogs_warn("mme_ue context has already been removed");
+        return;
+    }
+
     switch (e->id) {
     case OGS_FSM_ENTRY_SIG:
         CLEAR_SERVICE_INDICATOR(mme_ue);