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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ipa: Fix use of null pointer in log macro<br><br>Fixes: Coverity CID#214962<br>Fixes: Coverity CID#214963<br>Change-Id: Iafea915dbbbfbaa710fb5899cb9be5e507ba384c<br>---<br>M include/osmocom/bsc/abis_nm.h<br>M src/osmo-bsc/abis_nm.c<br>M src/osmo-bsc/bts_ipaccess_nanobts.c<br>3 files changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/abis_nm.h b/include/osmocom/bsc/abis_nm.h</span><br><span>index 3a0cb0e..bfafa63 100644</span><br><span>--- a/include/osmocom/bsc/abis_nm.h</span><br><span>+++ b/include/osmocom/bsc/abis_nm.h</span><br><span>@@ -178,4 +178,7 @@</span><br><span> </span><br><span> struct gsm_bts_trx_ts *abis_nm_get_ts(const struct msgb *oml_msg);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define LOGPFOH(ss, lvl, foh, fmt, args ...) LOGP(ss, lvl, "%s: " fmt, abis_nm_dump_foh(foh), ## args)</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEBUGPFOH(ss, foh, fmt, args ...) LOGPFOH(ss, LOGL_DEBUG, foh, fmt, ## args)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #endif /* _NM_H */</span><br><span>diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c</span><br><span>index e2c3283..73dc2d0 100644</span><br><span>--- a/src/osmo-bsc/abis_nm.c</span><br><span>+++ b/src/osmo-bsc/abis_nm.c</span><br><span>@@ -55,9 +55,6 @@</span><br><span> #define OM_HEADROOM_SIZE   128</span><br><span> #define IPACC_SEGMENT_SIZE       245</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define LOGPFOH(ss, lvl, foh, fmt, args ...) LOGP(ss, lvl, "%s: " fmt, abis_nm_dump_foh(foh), ## args)</span><br><span style="color: hsl(0, 100%, 40%);">-#define DEBUGPFOH(ss, foh, fmt, args ...) LOGPFOH(ss, LOGL_DEBUG, foh, fmt, ## args)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int abis_nm_tlv_parse(struct tlv_parsed *tp, struct gsm_bts *bts, const uint8_t *buf, int len)</span><br><span> {</span><br><span>   if (!bts->model)</span><br><span>diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>index 134d50a..577be13 100644</span><br><span>--- a/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>@@ -380,7 +380,7 @@</span><br><span>   struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr);</span><br><span> </span><br><span>         if (!trx || foh->obj_class != NM_OC_RADIO_CARRIER) {</span><br><span style="color: hsl(0, 100%, 40%);">-         LOG_TRX(trx, DNM, LOGL_ERROR, "Set Radio Carrier Attr Ack received on non Radio Carrier object!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                LOGPFOH(DNM, LOGL_ERROR, foh, "Set Radio Carrier Attr Ack received on non Radio Carrier object!\n");</span><br><span>               return;</span><br><span>      }</span><br><span>    osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SET_ATTR_ACK, NULL);</span><br><span>@@ -392,7 +392,7 @@</span><br><span>       struct gsm_bts_trx_ts *ts = abis_nm_get_ts(oml_msg);</span><br><span> </span><br><span>     if (!ts || foh->obj_class != NM_OC_CHANNEL) {</span><br><span style="color: hsl(0, 100%, 40%);">-                LOG_TS(ts, LOGL_ERROR, "Set Channel Attr Ack received on non Radio Channel object!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+             LOGPFOH(DNM, LOGL_ERROR, foh, "Set Channel Attr Ack received on non Radio Channel object!\n");</span><br><span>             return;</span><br><span>      }</span><br><span>    osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_SET_ATTR_ACK, NULL);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20676">change 20676</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-bsc/+/20676"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iafea915dbbbfbaa710fb5899cb9be5e507ba384c </div>
<div style="display:none"> Gerrit-Change-Number: 20676 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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 <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>