From b19f9d9c6e3c890ce4466c735a997c6420baa488 Mon Sep 17 00:00:00 2001
From: Dong Anyuan <donganyuan@cn.fujitsu.com>
Date: Fri, 31 May 2019 10:04:11 +0900
Subject: [PATCH] Fix Coverity Scan CID 341065 (Null-checking quantityConfig
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, 10 insertions(+), 10 deletions(-)
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index 8092c3390c..63daa318d5 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -3915,18 +3915,18 @@ flexran_rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt
size,
buffer,
PDCP_TRANSMISSION_MODE_CONTROL);
- if (quantityConfig){
- if (quantityConfig->quantityConfigEUTRA){
- if (quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ){
- free(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ);
- }
- if (quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP){
- free(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP);
- }
- free(quantityConfig->quantityConfigEUTRA);
+
+ if (quantityConfig->quantityConfigEUTRA){
+ if (quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ){
+ free(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ);
+ }
+ if (quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP){
+ free(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP);
}
- free(quantityConfig);
+ free(quantityConfig->quantityConfigEUTRA);
}
+ free(quantityConfig);
+ quantityConfig = NULL;
if(mac_MainConfig){
if(mac_MainConfig->ul_SCH_Config){
--
GitLab