Removed the null check

Signed-off-by: Rashmi <[email protected]>

Author: rsarwad

lte/gateway/c/core/oai/tasks/sgw/pgw_procedures.cpp

@@ -55,27 +55,13 @@ void delete_pending_procedures(
 pgw_ni_cbr_proc_t* pgw_create_procedure_create_bearer(
     sgw_eps_bearer_context_information_t* ctx_p) {
   pgw_ni_cbr_proc_t* s11_proc_create_bearer = new pgw_ni_cbr_proc_t();
-  if (!s11_proc_create_bearer) {
-    OAILOG_ERROR(LOG_SPGW_APP,
-                 "Failed to allocate memory for structure, pgw_ni_cbr_proc_t");
-    return nullptr;
-  }
   s11_proc_create_bearer->proc.type =
       PGW_BASE_PROC_TYPE_NETWORK_INITATED_CREATE_BEARER_REQUEST;
   pgw_base_proc_t* base_proc = (pgw_base_proc_t*)s11_proc_create_bearer;
 
   if (!ctx_p->pending_procedures) {
     ctx_p->pending_procedures =
         new sgw_eps_bearer_context_information_s::pending_procedures_s();
-    if (!ctx_p->pending_procedures) {
-      OAILOG_ERROR(LOG_SPGW_APP,
-                   "Failed to allocate memory for pending_procedures");
-      free_cpp_wrapper(reinterpret_cast<void**>(&s11_proc_create_bearer));
-      return nullptr;
-    }
-    if (!(ctx_p->pending_procedures)) {
-      return nullptr;
-    }
     LIST_INIT(ctx_p->pending_procedures);
   }
   LIST_INSERT_HEAD((ctx_p->pending_procedures), base_proc, entries);

lte/gateway/c/core/oai/tasks/sgw/sgw_context_manager.cpp

@@ -119,14 +119,6 @@ mme_sgw_tunnel_t* sgw_cm_create_s11_tunnel(teid_t remote_teid,
   mme_sgw_tunnel_t* new_tunnel = nullptr;
 
   new_tunnel = new mme_sgw_tunnel_t();
-  if (new_tunnel == nullptr) {
-    // failed to allocate memory, may be ENOMEM error
-    OAILOG_ERROR(LOG_SPGW_APP,
-                 "Failed to create tunnel for remote_teid " TEID_FMT "\n",
-                 remote_teid);
-    return nullptr;
-  }
-
   new_tunnel->remote_teid = remote_teid;
   new_tunnel->local_teid = local_teid;
 
@@ -141,16 +133,6 @@ sgw_cm_create_bearer_context_information_in_collection(teid_t teid) {
   new_bearer_context_information =
       new s_plus_p_gw_eps_bearer_context_information_t();
 
-  if (new_bearer_context_information == nullptr) {
-    // Memory allocation failed, may be ENOMEM error
-    OAILOG_ERROR(
-        LOG_SPGW_APP,
-        "Failed to create new bearer context information object for S11 "
-        "remote_teid " TEID_FMT "\n",
-        teid);
-    return nullptr;
-  }
-
   /*
    * Trying to insert the new tunnel into the map.
    * * * * If collision_p is not NULL (0), it means tunnel is already present.
@@ -228,16 +210,6 @@ sgw_eps_bearer_ctxt_t* sgw_cm_create_eps_bearer_ctxt_in_collection(
            ->sgw_eps_bearers_array[EBI_TO_INDEX(eps_bearer_idP)]) {
     new_eps_bearer_entry = new sgw_eps_bearer_ctxt_t();
 
-    if (new_eps_bearer_entry == nullptr) {
-      /*
-       * Malloc failed, may be ENOMEM error
-       */
-      OAILOG_ERROR(LOG_SPGW_APP,
-                   "Failed to create EPS bearer entry for EPS bearer id %u \n",
-                   eps_bearer_idP);
-      return nullptr;
-    }
-
     new_eps_bearer_entry->eps_bearer_id = eps_bearer_idP;
     sgw_pdn_connection->sgw_eps_bearers_array[EBI_TO_INDEX(eps_bearer_idP)] =
         new_eps_bearer_entry;

lte/gateway/c/core/oai/tasks/sgw/spgw_state_converter.cpp

@@ -937,11 +937,6 @@ void SpgwStateConverter::insert_proc_into_sgw_pending_procedures(
     sgw_eps_bearer_context_information_t::pending_procedures_s*
         pending_procedures) {
   pgw_ni_cbr_proc_t* s11_proc_create_bearer = new pgw_ni_cbr_proc_t();
-  if (!s11_proc_create_bearer) {
-    OAILOG_ERROR(LOG_SPGW_APP,
-                 "Failed to allocate memory for structure, pgw_ni_cbr_proc_t");
-    OAILOG_FUNC_OUT(LOG_SPGW_APP);
-  }
   s11_proc_create_bearer->teid = proto.teid();
   s11_proc_create_bearer->sdf_id = (sdf_id_t)proto.sdf_id();
   pgw_base_proc_t* base_proc = (pgw_base_proc_t*)s11_proc_create_bearer;
@@ -950,42 +945,18 @@ void SpgwStateConverter::insert_proc_into_sgw_pending_procedures(
 
   s11_proc_create_bearer->pending_eps_bearers =
       new pgw_ni_cbr_proc_s::pending_eps_bearers_s();
-  if (!(s11_proc_create_bearer->pending_eps_bearers)) {
-    OAILOG_ERROR(LOG_SPGW_APP,
-                 "Failed to allocate memory for pending_eps_bearers ");
-    delete s11_proc_create_bearer;
-    OAILOG_FUNC_OUT(LOG_SPGW_APP);
-  }
-
   LIST_INIT(s11_proc_create_bearer->pending_eps_bearers);
-  bool failed_to_allocate = false;
   for (auto& eps_bearer_proto : proto.pending_eps_bearers()) {
     sgw_eps_bearer_ctxt_t* eps_bearer = new sgw_eps_bearer_ctxt_t();
-    if (!eps_bearer) {
-      OAILOG_ERROR(LOG_SPGW_APP, "Failed to allocate memory for eps_bearer");
-      failed_to_allocate = true;
-      break;
-    }
 
     proto_to_sgw_eps_bearer(eps_bearer_proto, eps_bearer);
 
     sgw_eps_bearer_entry_wrapper_t* sgw_eps_bearer_entry_wrapper =
         new sgw_eps_bearer_entry_wrapper_t();
-    if (!sgw_eps_bearer_entry_wrapper) {
-      OAILOG_ERROR(
-          LOG_SPGW_APP,
-          "Failed to allocate memory for sgw_eps_bearer_entry_wrapper");
-      failed_to_allocate = true;
-      break;
-    }
     sgw_eps_bearer_entry_wrapper->sgw_eps_bearer_entry = eps_bearer;
     LIST_INSERT_HEAD((s11_proc_create_bearer->pending_eps_bearers),
                      sgw_eps_bearer_entry_wrapper, entries);
   }
-  if (failed_to_allocate) {
-    pgw_free_procedure_create_bearer(
-        (pgw_ni_cbr_proc_t**)&s11_proc_create_bearer);
-  }
 }
 
 void SpgwStateConverter::ue_to_proto(const spgw_ue_context_t* ue_state,
@@ -1043,11 +1014,6 @@ void SpgwStateConverter::proto_to_ue(const oai::SpgwUeContext& ue_proto,
     oai::S11BearerContext S11BearerContext = ue_proto.s11_bearer_context(idx);
     s_plus_p_gw_eps_bearer_context_information_t* spgw_context_p =
         new s_plus_p_gw_eps_bearer_context_information_t();
-    if (!spgw_context_p) {
-      OAILOG_ERROR(LOG_SPGW_APP,
-                   "Failed to allocate memory for SPGW context \n");
-      OAILOG_FUNC_OUT(LOG_SPGW_APP);
-    }
 
     proto_to_spgw_bearer_context(S11BearerContext, spgw_context_p);
     if ((state_teid_map->insert(

lte/gateway/c/core/oai/tasks/sgw/spgw_state_manager.cpp

@@ -51,18 +51,10 @@ void SpgwStateManager::create_state() {
 
   state_teid_map.map = new google::protobuf::Map<
       uint32_t, struct s_plus_p_gw_eps_bearer_context_information_s*>();
-  if (!(state_teid_map.map)) {
-    OAILOG_ERROR(LOG_S1AP, "Failed to allocate memory for state_teid_map ");
-    return;
-  }
   state_teid_map.set_name(S11_BEARER_CONTEXT_INFO_HT_NAME);
   state_teid_map.bind_callback(spgw_free_s11_bearer_context_information);
 
   state_ue_map.map = new google::protobuf::Map<uint64_t, spgw_ue_context_s*>();
-  if (!(state_ue_map.map)) {
-    OAILOG_ERROR(LOG_S1AP, "Failed to allocate memory for state_ue_map ");
-    return;
-  }
   state_ue_map.set_name(SPGW_STATE_UE_MAP);
   state_ue_map.bind_callback(sgw_free_ue_context);
 
@@ -115,10 +107,6 @@ status_code_e SpgwStateManager::read_ue_state_from_db() {
     }
     OAILOG_DEBUG(log_task, "Reading UE state from db for key %s", key.c_str());
     spgw_ue_context_t* ue_context_p = new spgw_ue_context_t();
-    if (!ue_context_p) {
-      OAILOG_ERROR(log_task, "Failed to allocate memory for ue_context_p");
-      return RETURNok;
-    }
     SpgwStateConverter::proto_to_ue(ue_proto, ue_context_p);
   }
   return RETURNok;

lte/gateway/c/core/oai/test/spgw_task/mock_spgw_op.cpp

@@ -56,10 +56,6 @@ status_code_e mock_read_spgw_ue_state_db(
     }
 
     spgw_ue_context_t* ue_context_p = new spgw_ue_context_t();
-    if (!ue_context_p) {
-      std::cerr << "Failed to allocate memory for ue_context_p" << std::endl;
-      OAILOG_FUNC_RETURN(LOG_SGW_S8, RETURNerror);
-    }
     SpgwStateConverter::proto_to_ue(ue_proto, ue_context_p);
   }
   return RETURNok;