From c3c2b774d631fe3cba4898bb8ef860b1021d968d Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Fri, 20 Jan 2017 15:15:58 +0100
Subject: [PATCH] bugfix: do not get pCC_id if UE_id is invalid

---
 openair2/LAYER2/MAC/eNB_scheduler_primitives.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
index 7f81fa906e..71cbb36ce9 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
@@ -288,7 +288,7 @@ int rrc_mac_remove_ue(module_id_t mod_idP,rnti_t rntiP)
 
   UE_list_t *UE_list = &eNB_mac_inst[mod_idP].UE_list;
   int UE_id = find_UE_id(mod_idP,rntiP);
-  int pCC_id = UE_PCCID(mod_idP,UE_id);
+  int pCC_id;
 
   if (UE_id == -1) {
     LOG_W(MAC,"rrc_mac_remove_ue: UE %x not found\n", rntiP);
@@ -296,6 +296,8 @@ int rrc_mac_remove_ue(module_id_t mod_idP,rnti_t rntiP)
     return 0;
   }
 
+  pCC_id = UE_PCCID(mod_idP,UE_id);
+
   LOG_I(MAC,"Removing UE %d from Primary CC_id %d (rnti %x)\n",UE_id,pCC_id, rntiP);
   dump_ue_list(UE_list,0);
 
-- 
GitLab