From 264af1860f09636500925b72000c9623c24fb580 Mon Sep 17 00:00:00 2001
From: Wang He <wanghe@cn.fujitsu.com>
Date: Tue, 9 Mar 2021 15:43:18 +0900
Subject: [PATCH] fix build error and core dump error.

---
 openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c | 2 +-
 openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c       | 2 +-
 openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c         | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c b/openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
index 70620ca1c8..0dd2c83cd0 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
@@ -44,7 +44,7 @@ void nr_pdcp_entity_drb_am_recv_pdu( nr_pdcp_entity_t *_entity, char *buffer, in
     entity->common.cipher(entity->common.security_context, (unsigned char *)buffer+3, size-3,
                           entity->rb_id, sn, entity->common.is_gnb ? 0 : 1);
 
-  entity->common.deliver_sdu(ctxt_pP, entity->common.deliver_sdu_data,
+  entity->common.deliver_sdu( entity->common.deliver_sdu_data,
                              (nr_pdcp_entity_t *)entity, buffer+3, size-3);
 }
 
diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
index 6b5c01033c..c08be61e7e 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
@@ -1167,7 +1167,7 @@ void nr_DRB_preconfiguration(uint16_t crnti)
     NULL,
     NULL,
     NULL,
-    Rlc_DRB_Bearer_ToAdd_list);
+    Rlc_Bearer_ToAdd_list);
   }
 
   if (!NODE_IS_CU(node_type)) {
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
index 5a46cef8a1..53f5eb7052 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
@@ -937,6 +937,7 @@ rlc_op_status_t nr_rrc_rlc_config_asn1_req (const protocol_ctxt_t   * const ctxt
 
   if (srb2add_listP != NULL) {
     for (i = 0; i < srb2add_listP->list.count; i++) {
+      if (rlc_bearer2add_list != NULL) {
       for(j = 0; j < rlc_bearer2add_list->list.count; j++){
         if(rlc_bearer2add_list->list.array[j]->servedRadioBearer != NULL){
           if(rlc_bearer2add_list->list.array[j]->servedRadioBearer->present == NR_RLC_BearerConfig__servedRadioBearer_PR_srb_Identity){  
@@ -946,12 +947,14 @@ rlc_op_status_t nr_rrc_rlc_config_asn1_req (const protocol_ctxt_t   * const ctxt
           }  
         }
       }
+      }
 
     }
   }
 
   if ((drb2add_listP != NULL) && (rlc_bearer2add_list != NULL)) {
     for (i = 0; i < drb2add_listP->list.count; i++) {
+      if (rlc_bearer2add_list != NULL) {
       for(j = 0; j < rlc_bearer2add_list->list.count; j++){
         if(rlc_bearer2add_list->list.array[j]->servedRadioBearer != NULL){
           if(rlc_bearer2add_list->list.array[j]->servedRadioBearer->present == NR_RLC_BearerConfig__servedRadioBearer_PR_drb_Identity){
@@ -961,6 +964,7 @@ rlc_op_status_t nr_rrc_rlc_config_asn1_req (const protocol_ctxt_t   * const ctxt
           }  
         }
       }
+      }
     }
   }