From 1de860bc89ee9b9b05512935cca5d4d9e70e0937 Mon Sep 17 00:00:00 2001
From: Dong Anyuan <donganyuan@cn.fujitsu.com>
Date: Fri, 31 May 2019 10:13:11 +0900
Subject: [PATCH] Fix Coverity Scan CID 341070 (Null-checking
quantityConfig->quantityConfigEUTRA 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 | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index 63daa318d53..8fe104f84c6 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -3916,15 +3916,15 @@ flexran_rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt
buffer,
PDCP_TRANSMISSION_MODE_CONTROL);
- if (quantityConfig->quantityConfigEUTRA){
- if (quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ){
- free(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ);
- }
- if (quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP){
- free(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP);
- }
- free(quantityConfig->quantityConfigEUTRA);
- }
+ free(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ);
+ quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ = NULL;
+
+ free(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP);
+ quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP = NULL;
+
+ free(quantityConfig->quantityConfigEUTRA);
+ quantityConfig->quantityConfigEUTRA = NULL;
+
free(quantityConfig);
quantityConfig = NULL;
--
GitLab