<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/23989">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">don't do explicit NULL checks before calling talloc_free()<br><br>Change-Id: I97a072ca32820ad34785ac6a54b00ed51b519305<br>---<br>M src/osmo_ss7.c<br>1 file changed, 2 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/89/23989/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c</span><br><span>index de072b4..6d68290 100644</span><br><span>--- a/src/osmo_ss7.c</span><br><span>+++ b/src/osmo_ss7.c</span><br><span>@@ -1734,8 +1734,7 @@</span><br><span>       struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(cli);</span><br><span> </span><br><span>        /* update the socket name */</span><br><span style="color: hsl(0, 100%, 40%);">-    if (asp->sock_name)</span><br><span style="color: hsl(0, 100%, 40%);">-          talloc_free(asp->sock_name);</span><br><span style="color: hsl(120, 100%, 40%);">+       talloc_free(asp->sock_name);</span><br><span>      asp->sock_name = osmo_sock_get_name(asp, ofd->fd);</span><br><span> </span><br><span>         LOGPASP(asp, DLSS7, LOGL_INFO, "Client connected %s\n", asp->sock_name);</span><br><span>@@ -1987,8 +1986,7 @@</span><br><span>        asp->server = srv;</span><br><span>        asp->xua_server = oxs;</span><br><span>    /* update the ASP socket name */</span><br><span style="color: hsl(0, 100%, 40%);">-        if (asp->sock_name)</span><br><span style="color: hsl(0, 100%, 40%);">-          talloc_free(asp->sock_name);</span><br><span style="color: hsl(120, 100%, 40%);">+       talloc_free(asp->sock_name);</span><br><span>      asp->sock_name = talloc_reparent(link, asp, sock_name);</span><br><span>   /* make sure the conn_cb() is called with the asp as private</span><br><span>          * data */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/23989">change 23989</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/libosmo-sccp/+/23989"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I97a072ca32820ad34785ac6a54b00ed51b519305 </div>
<div style="display:none"> Gerrit-Change-Number: 23989 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>