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
diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c
index 6750a46..2b9e3b2 100644
--- a/src/libvlr/vlr.c
+++ b/src/libvlr/vlr.c
@@ -152,7 +152,7 @@
struct vlr_instance *vlr = vsub->vlr;
if (strlen(gsup_msg->imsi) == 0)
- osmo_strlcpy(gsup_msg->imsi, vsub->imsi, sizeof(gsup_msg->imsi));
+ OSMO_STRLCPY_ARRAY(gsup_msg->imsi, vsub->imsi);
return vlr_tx_gsup_message(vlr, gsup_msg);
}
@@ -164,7 +164,7 @@
{
struct osmo_gsup_message gsup_reply = {0};
- osmo_strlcpy(gsup_reply.imsi, gsup_orig->imsi, sizeof(gsup_reply.imsi));
+ OSMO_STRLCPY_ARRAY(gsup_reply.imsi, gsup_orig->imsi);
gsup_reply.cause = cause;
gsup_reply.message_type =
OSMO_GSUP_TO_MSGT_ERROR(gsup_orig->message_type);
@@ -368,7 +368,7 @@
{
if (!vsub)
return;
- osmo_strlcpy(vsub->imsi, imsi, sizeof(vsub->imsi));
+ OSMO_STRLCPY_ARRAY(vsub->imsi, imsi);
vsub->id = atoll(vsub->imsi);
DEBUGP(DVLR, "set IMSI on subscriber; IMSI=%s id=%llu\n",
vsub->imsi, vsub->id);
@@ -378,7 +378,7 @@
{
if (!vsub)
return;
- osmo_strlcpy(vsub->imei, imei, sizeof(vsub->imei));
+ OSMO_STRLCPY_ARRAY(vsub->imei, imei);
DEBUGP(DVLR, "set IMEI on subscriber; IMSI=%s IMEI=%s\n",
vsub->imsi, vsub->imei);
}
@@ -387,7 +387,7 @@
{
if (!vsub)
return;
- osmo_strlcpy(vsub->imeisv, imeisv, sizeof(vsub->imeisv));
+ OSMO_STRLCPY_ARRAY(vsub->imeisv, imeisv);
DEBUGP(DVLR, "set IMEISV on subscriber; IMSI=%s IMEISV=%s\n",
vsub->imsi, vsub->imeisv);
}
@@ -397,7 +397,7 @@
{
if (!vsub)
return;
- osmo_strlcpy(vsub->msisdn, msisdn, sizeof(vsub->msisdn));
+ OSMO_STRLCPY_ARRAY(vsub->msisdn, msisdn);
DEBUGP(DVLR, "set MSISDN on subscriber; IMSI=%s MSISDN=%s\n",
vsub->imsi, vsub->msisdn);
}
@@ -566,7 +566,7 @@
struct osmo_gsup_message gsup_msg = {0};
gsup_msg.message_type = OSMO_GSUP_MSGT_AUTH_FAIL_REPORT;
- osmo_strlcpy(gsup_msg.imsi, vsub->imsi, sizeof(gsup_msg.imsi));
+ OSMO_STRLCPY_ARRAY(gsup_msg.imsi, vsub->imsi);
return vlr_tx_gsup_message(vsub->vlr, &gsup_msg);
}