From 3dae026c09ae30b5ec558a33cb1d216e3f26c9b5 Mon Sep 17 00:00:00 2001
From: Dong Anyuan <donganyuan@cn.fujitsu.com>
Date: Fri, 31 May 2019 10:23:58 +0900
Subject: [PATCH] Fix Coverity Scan CID 341067 (Null-checking mac_MainConfig
suggests that it may be null, but it has already been dereferenced on all
paths leading to the check.)
---
openair2/RRC/LTE/rrc_eNB.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index 8fe104f84c..240a7f3012 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -3928,18 +3928,16 @@ flexran_rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt
free(quantityConfig);
quantityConfig = NULL;
- if(mac_MainConfig){
- if(mac_MainConfig->ul_SCH_Config){
- free(mac_MainConfig->ul_SCH_Config);
- mac_MainConfig->ul_SCH_Config = NULL;
- }
- if(mac_MainConfig->phr_Config){
- free(mac_MainConfig->phr_Config);
- mac_MainConfig->phr_Config = NULL;
- }
- free(mac_MainConfig);
- mac_MainConfig = NULL;
+ if(mac_MainConfig->ul_SCH_Config){
+ free(mac_MainConfig->ul_SCH_Config);
+ mac_MainConfig->ul_SCH_Config = NULL;
+ }
+ if(mac_MainConfig->phr_Config){
+ free(mac_MainConfig->phr_Config);
+ mac_MainConfig->phr_Config = NULL;
}
+ free(mac_MainConfig);
+ mac_MainConfig = NULL;
}
--
GitLab