<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/15286">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Transceiver: fix segfault during init if IP addr binding fails<br><br>If osmo-trx is started and IP addr binding fails (ie because the IP<br>address is not assigned in the system), it will try to access a<br>heap-allocated Thread instance which was not initialized (because init()<br>function returned earlier).<br><br>Fixes: OS#4147<br>Change-Id: I19f9745cd026c0ff6581895a66bf91b40113b07d<br>---<br>M Transceiver52M/Transceiver.cpp<br>1 file changed, 5 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp</span><br><span>index 2d5c04e..e946aac 100644</span><br><span>--- a/Transceiver52M/Transceiver.cpp</span><br><span>+++ b/Transceiver52M/Transceiver.cpp</span><br><span>@@ -151,9 +151,11 @@</span><br><span> close(mClockSocket);</span><br><span> </span><br><span> for (size_t i = 0; i < mChans; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- mControlServiceLoopThreads[i]->cancel();</span><br><span style="color: hsl(0, 100%, 40%);">- mControlServiceLoopThreads[i]->join();</span><br><span style="color: hsl(0, 100%, 40%);">- delete mControlServiceLoopThreads[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mControlServiceLoopThreads[i]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ mControlServiceLoopThreads[i]->cancel();</span><br><span style="color: hsl(120, 100%, 40%);">+ mControlServiceLoopThreads[i]->join();</span><br><span style="color: hsl(120, 100%, 40%);">+ delete mControlServiceLoopThreads[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> mTxPriorityQueues[i].clear();</span><br><span> if (mCtrlSockets[i] >= 0)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/15286">change 15286</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-trx/+/15286"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I19f9745cd026c0ff6581895a66bf91b40113b07d </div>
<div style="display:none"> Gerrit-Change-Number: 15286 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>