<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/15805">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  fixeria: Looks good to me, approved
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty.c: don't ignore get_string_value() errors<br><br>Change uint8_t sapi to int, so we can properly assert on errors from<br>get_string_value().<br><br>Fixes: CID#205066, CID#205069<br>Change-Id: I4d30afacfab93051868ae8f462cee9ad3dbc7fd0<br>---<br>M src/common/vty.c<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 865c236..2e7a66d 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -1603,11 +1603,11 @@</span><br><span> </span><br><span> DEFUN(logging_fltr_l1_sapi, logging_fltr_l1_sapi_cmd, "HIDDEN", "HIDDEN")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-       uint8_t sapi = get_string_value(l1sap_common_sapi_names, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+    int sapi = get_string_value(l1sap_common_sapi_names, argv[0]);</span><br><span>       struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span>      uint16_t **sapi_mask;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       OSMO_ASSERT(sapi != -EINVAL);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(sapi < 0);</span><br><span>    if (!tgt)</span><br><span>            return CMD_WARNING;</span><br><span> </span><br><span>@@ -1624,11 +1624,11 @@</span><br><span> </span><br><span> DEFUN(no_logging_fltr_l1_sapi, no_logging_fltr_l1_sapi_cmd, "HIDDEN", "HIDDEN")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-       uint8_t sapi = get_string_value(l1sap_common_sapi_names, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+    int sapi = get_string_value(l1sap_common_sapi_names, argv[0]);</span><br><span>       struct log_target *tgt = osmo_log_vty2tgt(vty);</span><br><span>      uint16_t *sapi_mask;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        OSMO_ASSERT(sapi != -EINVAL);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(sapi < 0);</span><br><span>    if (!tgt)</span><br><span>            return CMD_WARNING;</span><br><span>  if (!tgt->filter_data[LOG_FLT_L1_SAPI])</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/15805">change 15805</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-bts/+/15805"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4d30afacfab93051868ae8f462cee9ad3dbc7fd0 </div>
<div style="display:none"> Gerrit-Change-Number: 15805 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@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@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>