From 5d3640397abe7c2e48ec09fd3061cdfd395bab4a Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 16 May 2019 15:10:40 -0500 Subject: [PATCH] core: Quiet warning about strncpy use --- src/gprs.c | 4 ++-- src/handsfree.c | 2 +- src/sim-auth.c | 2 +- src/voicecall.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gprs.c b/src/gprs.c index f9ec60ef..bdb8c8a2 100644 --- a/src/gprs.c +++ b/src/gprs.c @@ -579,7 +579,7 @@ static void pri_ifupdown(const char *interface, ofono_bool_t active) return; memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, interface, IFNAMSIZ); + l_strlcpy(ifr.ifr_name, interface, IFNAMSIZ); if (ioctl(sk, SIOCGIFFLAGS, &ifr) < 0) goto done; @@ -615,7 +615,7 @@ static void pri_set_ipv4_addr(const char *interface, const char *address) return; memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, interface, IFNAMSIZ); + l_strlcpy(ifr.ifr_name, interface, IFNAMSIZ); if (ioctl(sk, SIOCGIFFLAGS, &ifr) < 0) goto done; diff --git a/src/handsfree.c b/src/handsfree.c index dccc449c..aea5fa5f 100644 --- a/src/handsfree.c +++ b/src/handsfree.c @@ -296,7 +296,7 @@ static void hf_cnum_callback(const struct ofono_error *error, int total, subscriber_number->type = numbers[num].type; strncpy(subscriber_number->number, numbers[num].number, - OFONO_MAX_PHONE_NUMBER_LENGTH + 1); + OFONO_MAX_PHONE_NUMBER_LENGTH); hf->subscriber_numbers = g_slist_prepend(hf->subscriber_numbers, subscriber_number); diff --git a/src/sim-auth.c b/src/sim-auth.c index 6b77afd9..0e13b533 100644 --- a/src/sim-auth.c +++ b/src/sim-auth.c @@ -656,7 +656,7 @@ static char *build_nai(const char *imsi) char mnc[3]; char *nai; - strncpy(mcc, imsi, 3); + memcpy(mcc, imsi, 3); if (strlen(imsi) == 16) { memcpy(mnc, imsi + 3, 3); diff --git a/src/voicecall.c b/src/voicecall.c index 704c7c6f..93a92544 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -3607,7 +3607,7 @@ static void emulator_atd_cb(struct ofono_emulator *em, emulator_dial(em, vc, num); } else { - strncpy(number, str, len - 1); + memcpy(number, str, len - 1); number[len - 1] = '\0'; emulator_dial(em, vc, number);