<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22644">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: unify the handling of **result when bind already present.<br><br>All bind function should work in the same way.<br>Also fixing a null pointer assignment if no **result is giving.<br><br>Change-Id: Idd0c2190d2af39804c18c4786a997079db9a4330<br>---<br>M src/gb/gprs_ns2_fr.c<br>M src/gb/gprs_ns2_frgre.c<br>M src/gb/gprs_ns2_udp.c<br>3 files changed, 9 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/22644/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c</span><br><span>index fc6a5c4..3af20b4 100644</span><br><span>--- a/src/gb/gprs_ns2_fr.c</span><br><span>+++ b/src/gb/gprs_ns2_fr.c</span><br><span>@@ -738,8 +738,12 @@</span><br><span>  if (strlen(netif) > IFNAMSIZ)</span><br><span>             return -EINVAL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     if (gprs_ns2_bind_by_name(nsi, name))</span><br><span style="color: hsl(120, 100%, 40%);">+ bind = gprs_ns2_bind_by_name(nsi, name);</span><br><span style="color: hsl(120, 100%, 40%);">+      if (bind) {</span><br><span style="color: hsl(120, 100%, 40%);">+           if (result)</span><br><span style="color: hsl(120, 100%, 40%);">+                   *result = bind;</span><br><span>              return -EALREADY;</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span> </span><br><span>        rc = ns2_bind_alloc(nsi, name, &bind);</span><br><span>   if (rc < 0)</span><br><span>diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c</span><br><span>index 88ef037..8b40d7b 100644</span><br><span>--- a/src/gb/gprs_ns2_frgre.c</span><br><span>+++ b/src/gb/gprs_ns2_frgre.c</span><br><span>@@ -546,7 +546,8 @@</span><br><span> </span><br><span>    bind = gprs_ns2_bind_by_name(nsi, name);</span><br><span>     if (bind) {</span><br><span style="color: hsl(0, 100%, 40%);">-             *result = bind;</span><br><span style="color: hsl(120, 100%, 40%);">+               if (result)</span><br><span style="color: hsl(120, 100%, 40%);">+                   *result = bind;</span><br><span>              return -EALREADY;</span><br><span>    }</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c</span><br><span>index 9277f9a..9bc63c7 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -320,7 +320,8 @@</span><br><span> </span><br><span>     bind = gprs_ns2_ip_bind_by_sockaddr(nsi, local);</span><br><span>     if (bind) {</span><br><span style="color: hsl(0, 100%, 40%);">-             *result = bind;</span><br><span style="color: hsl(120, 100%, 40%);">+               if (result)</span><br><span style="color: hsl(120, 100%, 40%);">+                   *result = bind;</span><br><span>              return -EBUSY;</span><br><span>       }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22644">change 22644</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/libosmocore/+/22644"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Idd0c2190d2af39804c18c4786a997079db9a4330 </div>
<div style="display:none"> Gerrit-Change-Number: 22644 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>