From 1b891bb60048244afc249175712e1fd5c298a64e Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Wed, 2 Feb 2022 15:00:51 +0100
Subject: [PATCH] srsue,rrc: check present flag before parsing UCI PUSCH
 scaling info

---
 srsue/src/stack/rrc_nr/rrc_nr.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srsue/src/stack/rrc_nr/rrc_nr.cc b/srsue/src/stack/rrc_nr/rrc_nr.cc
index 074306f55..ace2f9a4a 100644
--- a/srsue/src/stack/rrc_nr/rrc_nr.cc
+++ b/srsue/src/stack/rrc_nr/rrc_nr.cc
@@ -1537,9 +1537,11 @@ bool rrc_nr::apply_sp_cell_ded_ul_pusch(const asn1::rrc_nr::pusch_cfg_s& pusch_c
           logger.warning("Option beta_offsets not of type semi_static");
           return false;
         }
-        if (make_phy_pusch_scaling(pusch_cfg.uci_on_pusch.setup(), &phy_cfg.pusch.scaling) == false) {
-          logger.warning("Warning while building scaling structure");
-          return false;
+        if (pusch_cfg.uci_on_pusch_present) {
+          if (make_phy_pusch_scaling(pusch_cfg.uci_on_pusch.setup(), &phy_cfg.pusch.scaling) == false) {
+            logger.warning("Warning while building scaling structure");
+            return false;
+          }
         }
       } else {
         logger.warning("Option beta_offsets not present");