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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">deal with rate_ctr_group_alloc() returning NULL<br><br>Change-Id: I47d6623b9eca704e3c2537cfb5799a4c0749a7bc<br>Related: #3701<br>---<br>M src/gb/gprs_bssgp.c<br>M src/gb/gprs_ns.c<br>2 files changed, 8 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c</span><br><span>index 550757f..b695c28 100644</span><br><span>--- a/src/gb/gprs_bssgp.c</span><br><span>+++ b/src/gb/gprs_bssgp.c</span><br><span>@@ -128,6 +128,10 @@</span><br><span>   ctx->nsei = nsei;</span><br><span>         /* FIXME: BVCI is not unique, only BVCI+NSEI ?!? */</span><br><span>  ctx->ctrg = rate_ctr_group_alloc(ctx, &bssgp_ctrg_desc, bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ctx->ctrg) {</span><br><span style="color: hsl(120, 100%, 40%);">+          talloc_free(ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+             return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+  }</span><br><span>    ctx->fc = talloc_zero(ctx, struct bssgp_flow_control);</span><br><span>    /* cofigure for 2Mbit, 30 packets in queue */</span><br><span>        bssgp_fc_init(ctx->fc, 100000, 2*1024*1024/8, 30, &_bssgp_tx_dl_ud);</span><br><span>diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c</span><br><span>index d72003e..3679a5b 100644</span><br><span>--- a/src/gb/gprs_ns.c</span><br><span>+++ b/src/gb/gprs_ns.c</span><br><span>@@ -333,6 +333,10 @@</span><br><span>      nsvc->nsi = nsi;</span><br><span>  osmo_timer_setup(&nsvc->timer, gprs_ns_timer_cb, nsvc);</span><br><span>       nsvc->ctrg = rate_ctr_group_alloc(nsvc, &nsvc_ctrg_desc, nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+       if (!nsvc->ctrg) {</span><br><span style="color: hsl(120, 100%, 40%);">+         talloc_free(nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+            return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+  }</span><br><span>    nsvc->statg = osmo_stat_item_group_alloc(nsvc, &nsvc_statg_desc, nsvci);</span><br><span>      nsvc->sig_weight = sig_weight;</span><br><span>    nsvc->data_weight = data_weight;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13913">change 13913</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/13913"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I47d6623b9eca704e3c2537cfb5799a4c0749a7bc </div>
<div style="display:none"> Gerrit-Change-Number: 13913 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </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>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>