<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12587">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/l1ctl_link.c: check if l1ctl_fsm allocation failed<br><br>Change-Id: Ibd9404a888f02798224238a7b9ff4ebf09f03850<br>---<br>M src/host/trxcon/l1ctl_link.c<br>1 file changed, 11 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c</span><br><span>index 23019fd..1350c3c 100644</span><br><span>--- a/src/host/trxcon/l1ctl_link.c</span><br><span>+++ b/src/host/trxcon/l1ctl_link.c</span><br><span>@@ -243,6 +243,16 @@</span><br><span>                return -ENOMEM;</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Allocate a new dedicated state machine */</span><br><span style="color: hsl(120, 100%, 40%);">+  l1l_new->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l_new,</span><br><span style="color: hsl(120, 100%, 40%);">+                NULL, LOGL_DEBUG, "l1ctl_link");</span><br><span style="color: hsl(120, 100%, 40%);">+    if (l1l_new->fsm == NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+                LOGP(DTRX, LOGL_ERROR, "Failed to allocate an instance "</span><br><span style="color: hsl(120, 100%, 40%);">+                    "of FSM '%s'\n", l1ctl_fsm.name);</span><br><span style="color: hsl(120, 100%, 40%);">+           talloc_free(l1l_new);</span><br><span style="color: hsl(120, 100%, 40%);">+         return -ENOMEM;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  /* Create a socket and bind handlers */</span><br><span>      bfd = &l1l_new->listen_bfd;</span><br><span>   rc = osmo_sock_unix_init_ofd(bfd, SOCK_STREAM, 0, sock_path,</span><br><span>@@ -250,6 +260,7 @@</span><br><span>   if (rc < 0) {</span><br><span>             LOGP(DL1C, LOGL_ERROR, "Could not create UNIX socket: %s\n",</span><br><span>                       strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+             osmo_fsm_inst_free(l1l_new->fsm);</span><br><span>                 talloc_free(l1l_new);</span><br><span>                return rc;</span><br><span>   }</span><br><span>@@ -268,10 +279,6 @@</span><br><span>      */</span><br><span>  l1l_new->wq.bfd.fd = -1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Allocate a new dedicated state machine */</span><br><span style="color: hsl(0, 100%, 40%);">-    l1l_new->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l_new,</span><br><span style="color: hsl(0, 100%, 40%);">-          NULL, LOGL_DEBUG, "l1ctl_link");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>   *l1l = l1l_new;</span><br><span> </span><br><span>  return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12587">change 12587</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/12587"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ibd9404a888f02798224238a7b9ff4ebf09f03850 </div>
<div style="display:none"> Gerrit-Change-Number: 12587 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>