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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CBCH: sprinkle some OMSO_ASSERT() and guard against talloc failure<br><br>Change-Id: I85fdecbf20de83a6f925765a46b5cd14765da03e<br>---<br>M src/common/cbch.c<br>1 file changed, 5 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/cbch.c b/src/common/cbch.c</span><br><span>index 7bbe2c9..c628cb5 100644</span><br><span>--- a/src/common/cbch.c</span><br><span>+++ b/src/common/cbch.c</span><br><span>@@ -20,6 +20,7 @@</span><br><span> </span><br><span> #include <errno.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> #include <osmocom/gsm/protocol/gsm_04_12.h></span><br><span> </span><br><span>@@ -59,6 +60,7 @@</span><br><span>             /* No message: Send NULL mesage */</span><br><span>           return get_smscb_null_block(out);</span><br><span>    }</span><br><span style="color: hsl(120, 100%, 40%);">+     OSMO_ASSERT(msg->next_seg < 4);</span><br><span> </span><br><span>    block_type = (struct gsm412_block_type *) out++;</span><br><span> </span><br><span>@@ -70,6 +72,7 @@</span><br><span>     to_copy = GSM412_MSG_LEN - (msg->next_seg * GSM412_BLOCK_LEN);</span><br><span>    if (to_copy > GSM412_BLOCK_LEN)</span><br><span>           to_copy = GSM412_BLOCK_LEN;</span><br><span style="color: hsl(120, 100%, 40%);">+   OSMO_ASSERT(to_copy >= 0);</span><br><span> </span><br><span>    /* copy data and increment index */</span><br><span>  memcpy(out, &msg->msg[msg->next_seg * GSM412_BLOCK_LEN], to_copy);</span><br><span>@@ -115,6 +118,8 @@</span><br><span>   }</span><br><span> </span><br><span>        scm = talloc_zero_size(bts, sizeof(*scm));</span><br><span style="color: hsl(120, 100%, 40%);">+    if (!scm)</span><br><span style="color: hsl(120, 100%, 40%);">+             return -1;</span><br><span> </span><br><span>       /* initialize entire message with default padding */</span><br><span>         memset(scm->msg, GSM_MACBLOCK_PADDING, sizeof(scm->msg));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10848">change 10848</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/10848"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I85fdecbf20de83a6f925765a46b5cd14765da03e </div>
<div style="display:none"> Gerrit-Change-Number: 10848 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>