[XS] Change in osmo-msc[master]: libvlr: replace strncpy with osmo_strlcpy

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/39565?usp=email ) Change subject: libvlr: replace strncpy with osmo_strlcpy ...................................................................... libvlr: replace strncpy with osmo_strlcpy The compile warns about these strncpys because they might not null terminated. Even the next line ensures this. Change-Id: I96a27ef42cb06dd2365f5c9902933323c7caf9a8 --- M src/libvlr/vlr_auth_fsm.c M src/libvlr/vlr_lu_fsm.c 2 files changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/65/39565/1 diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c index b4ebd05..818daa0 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -540,8 +540,7 @@ LOGVSUBP(LOGL_ERROR, vsub, "IMSI in ID RESP differs:" " %s\n", mi_string); } else { - strncpy(vsub->imsi, mi_string, sizeof(vsub->imsi)); - vsub->imsi[sizeof(vsub->imsi)-1] = '\0'; + osmo_strlcpy(vsub->imsi, mi_string, sizeof(vsub->imsi)); } /* retry with identity=IMSI */ afp->by_imsi = true; diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 2854d9d..d99a771 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -1675,8 +1675,7 @@ lfp->is_utran = is_utran; lfp->assign_tmsi = assign_tmsi; if (imsi) { - strncpy(lfp->imsi, imsi, sizeof(lfp->imsi)-1); - lfp->imsi[sizeof(lfp->imsi)-1] = '\0'; + osmo_strlcpy(lfp->imsi, imsi, sizeof(lfp->imsi)); lfp->lu_by_tmsi = false; } fi->priv = lfp; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/39565?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I96a27ef42cb06dd2365f5c9902933323c7caf9a8 Gerrit-Change-Number: 39565 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>