From cdbe6a6e1d5d8d689319378b3380bcbc664b88dd Mon Sep 17 00:00:00 2001
From: Fabian Eckermann <fabian@srs.io>
Date: Fri, 17 Dec 2021 15:03:12 +0100
Subject: [PATCH] Make sure to not access out-of-bounds iterator when erasing
 vector elements.

---
 srsenb/src/stack/rrc/ue_meas_cfg.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srsenb/src/stack/rrc/ue_meas_cfg.cc b/srsenb/src/stack/rrc/ue_meas_cfg.cc
index dc4b54d0f..3b637b874 100644
--- a/srsenb/src/stack/rrc/ue_meas_cfg.cc
+++ b/srsenb/src/stack/rrc/ue_meas_cfg.cc
@@ -425,8 +425,7 @@ bool apply_meascfg_updates(meas_cfg_s&             meascfg,
       for (auto it = current_meascfg.meas_id_to_add_mod_list.begin();
            it != current_meascfg.meas_id_to_add_mod_list.end();) {
         if (it->meas_obj_id == found_src_obj->meas_obj_id) {
-          auto rit = it++;
-          current_meascfg.meas_id_to_add_mod_list.erase(rit);
+          it = current_meascfg.meas_id_to_add_mod_list.erase(it);
         } else {
           ++it;
         }