From bd5c1fd83a8e77e3c04fc3dc00a2cab544c312e4 Mon Sep 17 00:00:00 2001
From: Ismael Gomez <ismael@softwareradiosystems.com>
Date: Tue, 10 Jul 2018 19:52:46 +0200
Subject: [PATCH] deallocate dedicatedInfoNAS in rrc

---
 lib/include/srslte/common/buffer_pool.h | 2 +-
 srsue/src/upper/nas.cc                  | 1 -
 srsue/src/upper/rrc.cc                  | 6 ++++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/include/srslte/common/buffer_pool.h b/lib/include/srslte/common/buffer_pool.h
index 75c56fc0e..0a87c0df1 100644
--- a/lib/include/srslte/common/buffer_pool.h
+++ b/lib/include/srslte/common/buffer_pool.h
@@ -183,7 +183,7 @@ public:
     }
     b->reset();
     if (!pool->deallocate(b)) {
-      fprintf(stderr, "Error deallocating PDU: Addr=0x%lx not found in pool\n", (uint64_t) b);
+      printf("Error deallocating PDU: Addr=0x%lx not found in pool\n", (uint64_t) b);
     }
     b = NULL;
   }
diff --git a/srsue/src/upper/nas.cc b/srsue/src/upper/nas.cc
index 569ef7529..8672eb062 100644
--- a/srsue/src/upper/nas.cc
+++ b/srsue/src/upper/nas.cc
@@ -250,7 +250,6 @@ bool nas::rrc_connect() {
     }
   } else {
     nas_log->error("Could not establish RRC connection\n");
-    pool->deallocate(dedicatedInfoNAS);
   }
   return false;
 }
diff --git a/srsue/src/upper/rrc.cc b/srsue/src/upper/rrc.cc
index 21d0b7833..440b4a318 100644
--- a/srsue/src/upper/rrc.cc
+++ b/srsue/src/upper/rrc.cc
@@ -526,6 +526,12 @@ bool rrc::connection_request(LIBLTE_RRC_CON_REQ_EST_CAUSE_ENUM cause,
     }
   }
 
+  if (!ret) {
+    rrc_log->warning("Could not estblish connection. Deallocating dedicatedInfoNAS PDU\n");
+    pool->deallocate(this->dedicatedInfoNAS);
+    this->dedicatedInfoNAS = NULL;
+  }
+
   pthread_mutex_unlock(&mutex);
   return ret;
 }