From 6afc0dee50fec85eda9abca10eba0d4787ef1c6e Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Mon, 14 Apr 2025 09:00:51 +0200
Subject: [PATCH] Correctly free 2-step RA/MsgA structures in fix_scc()

---
 openair2/GNB_APP/gnb_config.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c
index 3eb43e21a0..a300a182ae 100644
--- a/openair2/GNB_APP/gnb_config.c
+++ b/openair2/GNB_APP/gnb_config.c
@@ -548,8 +548,10 @@ void fix_scc(NR_ServingCellConfigCommon_t *scc, uint64_t ssbmap)
       && (int)scc->uplinkConfigCommon->initialUplinkBWP->ext1->msgA_ConfigCommon_r16->choice.setup->msgA_PUSCH_Config_r16
                  ->msgA_PUSCH_ResourceGroupA_r16->msgA_PUSCH_TimeDomainOffset_r16
              == 0) {
-    free(scc->uplinkConfigCommon->initialUplinkBWP->ext1);
-    scc->uplinkConfigCommon->initialUplinkBWP->ext1 = NULL;
+    NR_BWP_UplinkCommon_t *ulcc = scc->uplinkConfigCommon->initialUplinkBWP;
+    ASN_STRUCT_FREE(asn_DEF_NR_SetupRelease_MsgA_ConfigCommon_r16, ulcc->ext1->msgA_ConfigCommon_r16);
+    free(ulcc->ext1);
+    ulcc->ext1 = NULL;
   }
 
   if ((int)*scc->n_TimingAdvanceOffset == -1) {