Change in ...osmo-trx[master]: Transceiver: fix segfault during init if IP addr binding fails

pespin gerrit-no-reply at lists.osmocom.org
Mon Aug 26 08:55:35 UTC 2019


pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15286


Change subject: Transceiver: fix segfault during init if IP addr binding fails
......................................................................

Transceiver: fix segfault during init if IP addr binding fails

If osmo-trx is started and IP addr binding fails (ie because the IP
address is not assigned in the system), it will try to access a
heap-allocated Thread instance which was not initialized (because init()
function returned earlier).

Fixes: OS#4147
Change-Id: I19f9745cd026c0ff6581895a66bf91b40113b07d
---
M Transceiver52M/Transceiver.cpp
1 file changed, 5 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/86/15286/1

diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp
index 2d5c04e..e946aac 100644
--- a/Transceiver52M/Transceiver.cpp
+++ b/Transceiver52M/Transceiver.cpp
@@ -151,9 +151,11 @@
     close(mClockSocket);
 
   for (size_t i = 0; i < mChans; i++) {
-    mControlServiceLoopThreads[i]->cancel();
-    mControlServiceLoopThreads[i]->join();
-    delete mControlServiceLoopThreads[i];
+    if (mControlServiceLoopThreads[i]) {
+      mControlServiceLoopThreads[i]->cancel();
+      mControlServiceLoopThreads[i]->join();
+      delete mControlServiceLoopThreads[i];
+    }
 
     mTxPriorityQueues[i].clear();
     if (mCtrlSockets[i] >= 0)

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15286
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I19f9745cd026c0ff6581895a66bf91b40113b07d
Gerrit-Change-Number: 15286
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190826/9496294d/attachment.html>


More information about the gerrit-log mailing list