Change in libosmocore[master]: gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller

[laforge]

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

Change subject: gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller
......................................................................

gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller

Change-Id: I71f347a2f0376716e5f83d33a7931eb8a99aad77
---
M src/gb/gprs_ns.c
1 file changed, 7 insertions(+), 2 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  fixeria: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c
index c77ebb3..ac39e4a 100644
--- a/src/gb/gprs_ns.c
+++ b/src/gb/gprs_ns.c
@@ -1884,13 +1884,18 @@
  */
 struct gprs_ns_inst *gprs_ns_instantiate(gprs_ns_cb_t *cb, void *ctx)
 {
-	struct gprs_ns_inst *nsi = talloc_zero(ctx, struct gprs_ns_inst);
+	struct gprs_ns_inst *nsi;
 
 	if (!gprs_sns_fsm_registered) {
-		gprs_sns_init();
+		int rc = gprs_sns_init();
+		if (rc < 0)
+			return NULL;
 		gprs_sns_fsm_registered = true;
 	}
 
+	nsi = talloc_zero(ctx, struct gprs_ns_inst);
+	if (!nsi)
+		return NULL;
 	nsi->cb = cb;
 	INIT_LLIST_HEAD(&nsi->gprs_nsvcs);
 	nsi->timeout[NS_TOUT_TNS_BLOCK] = 3;

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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I71f347a2f0376716e5f83d33a7931eb8a99aad77
Gerrit-Change-Number: 16368
Gerrit-PatchSet: 3
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191201/886fc611/attachment.htm>