From d148012d828585a69d35bbb831ff815e013d5606 Mon Sep 17 00:00:00 2001
From: Sukchan Lee <acetcom@gmail.com>
Date: Mon, 21 Sep 2020 20:06:41 -0400
Subject: [PATCH] Fix the MME crash #551

---
 src/amf/ngap-path.c | 5 ++++-
 src/mme/s1ap-path.c | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/amf/ngap-path.c b/src/amf/ngap-path.c
index 8266cc1349..7f549d5ca0 100644
--- a/src/amf/ngap-path.c
+++ b/src/amf/ngap-path.c
@@ -235,7 +235,10 @@ int ngap_send_to_nas(ran_ue_t *ran_ue,
     } else if (h->extended_protocol_discriminator ==
             OGS_NAS_EXTENDED_PROTOCOL_DISCRIMINATOR_5GSM) {
         amf_ue_t *amf_ue = ran_ue->amf_ue;
-        ogs_assert(amf_ue);
+        if (!amf_ue) {
+            ogs_error("No UE Context");
+            return OGS_ERROR;
+        }
         return ngap_send_to_5gsm(amf_ue, nasbuf);
     } else {
         ogs_error("Unknown NAS Protocol discriminator 0x%02x",
diff --git a/src/mme/s1ap-path.c b/src/mme/s1ap-path.c
index 0efa32ec69..2f8db40d41 100644
--- a/src/mme/s1ap-path.c
+++ b/src/mme/s1ap-path.c
@@ -235,9 +235,13 @@ int s1ap_send_to_nas(enb_ue_t *enb_ue,
             mme_event_free(e);
         }
         return rv;
-    } else if (h->protocol_discriminator == OGS_NAS_PROTOCOL_DISCRIMINATOR_ESM) {
+    } else if (h->protocol_discriminator ==
+            OGS_NAS_PROTOCOL_DISCRIMINATOR_ESM) {
         mme_ue_t *mme_ue = enb_ue->mme_ue;
-        ogs_assert(mme_ue);
+        if (!mme_ue) {
+            ogs_error("No UE Context");
+            return OGS_ERROR;
+        }
         return s1ap_send_to_esm(mme_ue, nasbuf);
     } else {
         ogs_error("Unknown/Unimplemented NAS Protocol discriminator 0x%02x",