From be4ba504bd85b5d7369f522327e646ec63c05fa9 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Mon, 6 Jan 2020 22:27:29 +0100 Subject: [PATCH] fix another bunch of uninit memory in tests, and one in srsENB --- lib/src/phy/ch_estimation/test/chest_test_sl.c | 3 +-- lib/src/phy/sync/test/psss_file_test.c | 2 +- lib/src/phy/ue/test/ue_sync_test_nbiot_usrp.c | 2 +- lib/src/radio/test/benchmark_radio.cc | 2 +- srsenb/src/phy/phy_common.cc | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/src/phy/ch_estimation/test/chest_test_sl.c b/lib/src/phy/ch_estimation/test/chest_test_sl.c index 6ba70d9a3..e85ceb007 100644 --- a/lib/src/phy/ch_estimation/test/chest_test_sl.c +++ b/lib/src/phy/ch_estimation/test/chest_test_sl.c @@ -108,8 +108,7 @@ int main(int argc, char** argv) } // Variables init Tx - srslte_chest_sl_t q; - memset(q, 0, sizeof(q)); + srslte_chest_sl_t q = {}; if (run_psbch_test) { // Tx diff --git a/lib/src/phy/sync/test/psss_file_test.c b/lib/src/phy/sync/test/psss_file_test.c index 50e5bb8fa..0c2b32e85 100644 --- a/lib/src/phy/sync/test/psss_file_test.c +++ b/lib/src/phy/sync/test/psss_file_test.c @@ -126,7 +126,7 @@ int main(int argc, char** argv) cf_t* input_buffer_temp = srslte_vec_malloc(sizeof(cf_t) * sf_n_samples); // init PSSS - srslte_psss_t psss; + srslte_psss_t psss = {}; srslte_psss_init(&psss, nof_prb, cp); struct timeval t[3]; diff --git a/lib/src/phy/ue/test/ue_sync_test_nbiot_usrp.c b/lib/src/phy/ue/test/ue_sync_test_nbiot_usrp.c index 44529d8bf..ef0499db1 100644 --- a/lib/src/phy/ue/test/ue_sync_test_nbiot_usrp.c +++ b/lib/src/phy/ue/test/ue_sync_test_nbiot_usrp.c @@ -175,7 +175,7 @@ int main(int argc, char** argv) } } - srslte_nbiot_ue_sync_t ue_sync; + srslte_nbiot_ue_sync_t ue_sync = {}; if (srslte_ue_sync_nbiot_init(&ue_sync, cell, srslte_rf_recv_wrapper_cs, (void*)&rf)) { fprintf(stderr, "Error initiating ue_sync\n"); exit(-1); diff --git a/lib/src/radio/test/benchmark_radio.cc b/lib/src/radio/test/benchmark_radio.cc index 2e6abeaf2..51858b0cd 100644 --- a/lib/src/radio/test/benchmark_radio.cc +++ b/lib/src/radio/test/benchmark_radio.cc @@ -246,7 +246,7 @@ int main(int argc, char** argv) srslte_timestamp_t ts_prev[SRSLTE_MAX_RADIOS], ts_rx[SRSLTE_MAX_RADIOS], ts_tx; uint32_t nof_gaps = 0; char filename[256] = {}; - srslte_filesink_t filesink[SRSLTE_MAX_RADIOS]; + srslte_filesink_t filesink[SRSLTE_MAX_RADIOS] = {}; srslte_dft_plan_t dft_plan = {}, idft_plan = {}; srslte_agc_t agc[SRSLTE_MAX_RADIOS] = {}; diff --git a/srsenb/src/phy/phy_common.cc b/srsenb/src/phy/phy_common.cc index 6839a51f2..b1e70c0ef 100644 --- a/srsenb/src/phy/phy_common.cc +++ b/srsenb/src/phy/phy_common.cc @@ -251,7 +251,7 @@ void phy_common::ue_db_set_last_ul_tb(uint16_t rnti, uint32_t pid, srslte_ra_tb_ srslte_ra_tb_t phy_common::ue_db_get_last_ul_tb(uint16_t rnti, uint32_t pid) { pthread_mutex_lock(&user_mutex); - srslte_ra_tb_t ret; + srslte_ra_tb_t ret = {}; if (common_ue_db.count(rnti)) { ret = common_ue_db[rnti].last_tb[pid % SRSLTE_FDD_NOF_HARQ]; }