From afc209711c5462b247ecc7b5a80b494a720f574c Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 4 Mar 2020 18:25:49 +0000 Subject: [PATCH] Fix jump depending on uninitialized variable in srsenb::sched_ue::set_bearer_cfg_unlocked --- lib/include/srslte/interfaces/sched_interface.h | 8 ++++---- srsenb/hdr/stack/rrc/rrc.h | 2 +- srsenb/src/stack/rrc/rrc.cc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/include/srslte/interfaces/sched_interface.h b/lib/include/srslte/interfaces/sched_interface.h index ce6b11885..704042443 100644 --- a/lib/include/srslte/interfaces/sched_interface.h +++ b/lib/include/srslte/interfaces/sched_interface.h @@ -102,10 +102,10 @@ public: }; struct ue_bearer_cfg_t { - int priority; - int bsd; - int pbr; - int group; + int priority = 0; + int bsd = 0; + int pbr = 0; + int group = 0; enum { IDLE = 0, UL, DL, BOTH } direction = IDLE; }; diff --git a/srsenb/hdr/stack/rrc/rrc.h b/srsenb/hdr/stack/rrc/rrc.h index c13213257..c093dd2cb 100644 --- a/srsenb/hdr/stack/rrc/rrc.h +++ b/srsenb/hdr/stack/rrc/rrc.h @@ -301,7 +301,7 @@ public: uint8_t mmec = 0; // state - sched_interface::ue_cfg_t current_sched_ue_cfg; + sched_interface::ue_cfg_t current_sched_ue_cfg = {}; uint32_t rlf_cnt = 0; uint8_t transaction_id = 0; rrc_state_t state = RRC_STATE_IDLE; diff --git a/srsenb/src/stack/rrc/rrc.cc b/srsenb/src/stack/rrc/rrc.cc index 4b8017d00..2c9ad7edf 100644 --- a/srsenb/src/stack/rrc/rrc.cc +++ b/srsenb/src/stack/rrc/rrc.cc @@ -1262,7 +1262,7 @@ void rrc::ue::handle_rrc_reconf_complete(rrc_conn_recfg_complete_s* msg, srslte: parent->mac->ue_cfg(rnti, ¤t_sched_ue_cfg); // Finally, add SRB2 and DRB1 to the scheduler - srsenb::sched_interface::ue_bearer_cfg_t bearer_cfg; + srsenb::sched_interface::ue_bearer_cfg_t bearer_cfg = {}; bearer_cfg.direction = srsenb::sched_interface::ue_bearer_cfg_t::BOTH; bearer_cfg.group = 0; parent->mac->bearer_ue_cfg(rnti, 2, &bearer_cfg);