From 2507933c824fc54d59051335add92eb16e633cb6 Mon Sep 17 00:00:00 2001
From: "Raymond.Knopp" <raymond.knopp@eurecom.fr>
Date: Wed, 28 Dec 2016 11:43:33 +0100
Subject: [PATCH] bugfix in rrc_eNB_s1AP.c. ue_context_p is used before
checking if pointer is non-null.
---
openair2/RRC/LITE/rrc_eNB_S1AP.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/openair2/RRC/LITE/rrc_eNB_S1AP.c b/openair2/RRC/LITE/rrc_eNB_S1AP.c
index a3dc9f47a1..8899c7d743 100644
--- a/openair2/RRC/LITE/rrc_eNB_S1AP.c
+++ b/openair2/RRC/LITE/rrc_eNB_S1AP.c
@@ -774,8 +774,8 @@ rrc_eNB_process_S1AP_DOWNLINK_NAS(
ue_initial_id = S1AP_DOWNLINK_NAS (msg_p).ue_initial_id;
eNB_ue_s1ap_id = S1AP_DOWNLINK_NAS (msg_p).eNB_ue_s1ap_id;
ue_context_p = rrc_eNB_get_ue_context_from_s1ap_ids(instance, ue_initial_id, eNB_ue_s1ap_id);
- srb_id = ue_context_p->ue_context.Srb2.Srb_info.Srb_id;
-
+
+
LOG_I(RRC, "[eNB %d] Received %s: ue_initial_id %d, eNB_ue_s1ap_id %d\n",
instance,
msg_name,
@@ -822,6 +822,9 @@ rrc_eNB_process_S1AP_DOWNLINK_NAS(
} else {
PROTOCOL_CTXT_SET_BY_INSTANCE(&ctxt, instance, ENB_FLAG_YES, ue_context_p->ue_context.rnti, 0, 0);
+ srb_id = ue_context_p->ue_context.Srb2.Srb_info.Srb_id;
+
+
/* Is it the first income from S1AP ? */
if (ue_context_p->ue_context.eNB_ue_s1ap_id == 0) {
ue_context_p->ue_context.eNB_ue_s1ap_id = S1AP_DOWNLINK_NAS (msg_p).eNB_ue_s1ap_id;
--
2.26.2