[MERGED] osmo-ttcn3-hacks[master]: BSSMAP_Emulation: ispresent(bssap.pdu.bssmap) before accessi...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: BSSMAP_Emulation: ispresent(bssap.pdu.bssmap) before accessing fields
......................................................................


BSSMAP_Emulation: ispresent(bssap.pdu.bssmap) before accessing fields

This seems not to be required on TITAN 6.3.0 on my laptop, but the
older 6.1.0 on Debian 9 seems to need it.

Change-Id: I574d8b79ac43e0fceddb3f9815666aef0ed66a3f
---
M library/BSSMAP_Emulation.ttcn
1 file changed, 9 insertions(+), 7 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/library/BSSMAP_Emulation.ttcn b/library/BSSMAP_Emulation.ttcn
index ca5afb9..5f0409f 100644
--- a/library/BSSMAP_Emulation.ttcn
+++ b/library/BSSMAP_Emulation.ttcn
@@ -334,13 +334,15 @@
 runs on BSSMAP_Emulation_CT {
 	/* decode + send decoded BSSAP to client */
 
-	/* BSC Side: If this is an assignment command, store CIC */
-	if (ischosen(bssap.pdu.bssmap.assignmentRequest) and
-	    ispresent(bssap.pdu.bssmap.assignmentRequest.circuitIdentityCode)) {
-		var BSSMAP_IE_CircuitIdentityCode cic_ie :=
-			bssap.pdu.bssmap.assignmentRequest.circuitIdentityCode;
-		var integer cic := (oct2int(cic_ie.cicHigh) * 256) + oct2int(cic_ie.cicLow);
-		f_comp_store_cic(client, cic);
+	if (ischosen(bssap.pdu.bssmap)) {
+		/* BSC Side: If this is an assignment command, store CIC */
+		if (ischosen(bssap.pdu.bssmap.assignmentRequest) and
+		    ispresent(bssap.pdu.bssmap.assignmentRequest.circuitIdentityCode)) {
+			var BSSMAP_IE_CircuitIdentityCode cic_ie :=
+				bssap.pdu.bssmap.assignmentRequest.circuitIdentityCode;
+			var integer cic := (oct2int(cic_ie.cicHigh) * 256) + oct2int(cic_ie.cicLow);
+			f_comp_store_cic(client, cic);
+		}
 	}
 
 	if (ischosen(bssap.pdu.dtap) and g_bssmap_ops.decode_dtap) {

-- 
To view, visit https://gerrit.osmocom.org/6141
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I574d8b79ac43e0fceddb3f9815666aef0ed66a3f
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder