cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

gsm_04_11: use gsm48_decode_bcd_number2(), evaluate rc 

Avoid deprecation warning: use gsm48_decode_bcd_number2() instead of
gsm48_decode_bcd_number().

Validate the return value and add error handling.

Change-Id: Ibef71c46d72d2d43123e68f73e5ed554a69243d8
This commit is contained in:
Neels Hofmeyr 2019-04-29 19:14:43 +02:00
parent 5b1e0309b5
commit 56f90132b8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libmsc/gsm_04_11.c
View File

@ -526,8 +526,12 @@ static int gsm340_rx_tpdu(struct gsm_trans *trans, struct msgb *msg,
gsms->dst.ton = (address_lv[1] >> 4) & 7;
gsms->dst.npi = address_lv[1] & 0xF;
/* convert to real number */
gsm48_decode_bcd_number(gsms->dst.addr,
sizeof(gsms->dst.addr), address_lv, 1);
if (gsm48_decode_bcd_number2(gsms->dst.addr,
sizeof(gsms->dst.addr), address_lv, da_len_bytes, 1)) {
LOG_TRANS(trans, LOGL_ERROR, "Failed to decode destination Address\n");
rc = GSM411_RP_CAUSE_SEMANT_INC_MSG;
goto out;
}
smsp += da_len_bytes;
gsms->protocol_id = *smsp++;