diff options
| author | Max <msuraev@sysmocom.de> | 2018-02-05 12:57:06 +0100 |
|---|---|---|
| committer | Max <msuraev@sysmocom.de> | 2018-02-05 12:57:06 +0100 |
| commit | 98f7467ac8ba53230d4ae6167aa5664a105323b3 (patch) | |
| tree | 2beb1d76dce3353b57d31ae9303254ad6e22465d /src/libmsc/gsm_04_08.c | |
| parent | c2007855cebd240cf2868ce0d2dd90ba42ddfa8a (diff) | |
Wrap osmo_strlcpy() calls
Using following semantic patch:
@@ expression A, B, C; @@
- osmo_strlcpy(A, B, sizeof(A));
+ OSMO_STRLCPY_ARRAY(A, B);
Which was applied using following command:
spatch --dir src -I src --sp-file strlcpy.spatch --in-place --recursive-includes
All the calls to osmo_strlcpy() which use destination buffer obtained
via sizeof() were replaced with the corresponding wrapper macro.
Change-Id: I67b482dedfa11237ac21894fc5930039e12434ab
Related: OS#2864
Diffstat (limited to 'src/libmsc/gsm_04_08.c')
| -rw-r--r-- | src/libmsc/gsm_04_08.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 5acc4e445..298acdcb5 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1635,8 +1635,8 @@ static int gsm48_cc_rx_setup(struct gsm_trans *trans, struct msgb *msg) /* use subscriber as calling party number */ setup.fields |= MNCC_F_CALLING; - osmo_strlcpy(setup.calling.number, trans->vsub->msisdn, sizeof(setup.calling.number)); - osmo_strlcpy(setup.imsi, trans->vsub->imsi, sizeof(setup.imsi)); + OSMO_STRLCPY_ARRAY(setup.calling.number, trans->vsub->msisdn); + OSMO_STRLCPY_ARRAY(setup.imsi, trans->vsub->imsi); /* bearer capability */ if (TLVP_PRESENT(&tp, GSM48_IE_BEARER_CAP)) { @@ -1824,7 +1824,7 @@ static int gsm48_cc_rx_call_conf(struct gsm_trans *trans, struct msgb *msg) } /* IMSI of called subscriber */ - osmo_strlcpy(call_conf.imsi, trans->vsub->imsi, sizeof(call_conf.imsi)); + OSMO_STRLCPY_ARRAY(call_conf.imsi, trans->vsub->imsi); new_cc_state(trans, GSM_CSTATE_MO_TERM_CALL_CONF); @@ -2003,8 +2003,8 @@ static int gsm48_cc_rx_connect(struct gsm_trans *trans, struct msgb *msg) tlv_parse(&tp, &gsm48_att_tlvdef, gh->data, payload_len, 0, 0); /* use subscriber as connected party number */ connect.fields |= MNCC_F_CONNECTED; - osmo_strlcpy(connect.connected.number, trans->vsub->msisdn, sizeof(connect.connected.number)); - osmo_strlcpy(connect.imsi, trans->vsub->imsi, sizeof(connect.imsi)); + OSMO_STRLCPY_ARRAY(connect.connected.number, trans->vsub->msisdn); + OSMO_STRLCPY_ARRAY(connect.imsi, trans->vsub->imsi); /* facility */ if (TLVP_PRESENT(&tp, GSM48_IE_FACILITY)) { |