Change in libosmocore[master]: gprs_ns2: don't OSMO_ASSERT() while freeing NS-VC.

laforge gerrit-no-reply at lists.osmocom.org
Wed Mar 3 07:50:00 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23183 )

Change subject: gprs_ns2: don't OSMO_ASSERT() while freeing NS-VC.
......................................................................

gprs_ns2: don't OSMO_ASSERT() while freeing NS-VC.

When freeing the NS-VC there are cases when the NSE is still alive.
This means that gprs_ns2_free_nsvc() calls  ns2_prim_status_ind(),
which in turn calls ns2_count_transfer_cap().  The latter must deal
with such a situation rather than OSMO_ASSERT()

Change-Id: I4f32dee705c9886717339fe7cce5b4cd8d2c18f7
---
M src/gb/gprs_ns2.c
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c
index a79dd05..c56b0b5 100644
--- a/src/gb/gprs_ns2.c
+++ b/src/gb/gprs_ns2.c
@@ -1455,8 +1455,9 @@
 		if (ns2_vc_is_unblocked(nsvc))
 			active_nsvcs++;
 	}
-	/* an alive nse should always have active_nsvcs */
-	OSMO_ASSERT(active_nsvcs);
+
+	if (!active_nsvcs)
+		return 0;
 
 	active_binds = talloc_zero_array(nse, struct gprs_ns2_vc_bind*, active_nsvcs);
 	if (!active_binds)

-- 
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23183
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I4f32dee705c9886717339fe7cce5b4cd8d2c18f7
Gerrit-Change-Number: 23183
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-CC: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210303/fc300627/attachment.htm>


More information about the gerrit-log mailing list