From 85c0dc4a92f036df7e332e8c4deaaae78575e294 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 12 Feb 2018 17:42:25 +0000 Subject: [PATCH] ppp/plugin: use g_strlcpy() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's nicer but also doesn't annoy gcc 8: "error: ‘strncpy’ specified bound depends on the length of the source argument [-Werror=stringop-overflow=]" --- src/ppp/nm-pppd-plugin.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/ppp/nm-pppd-plugin.c b/src/ppp/nm-pppd-plugin.c index e3df26ef08..989f74339d 100644 --- a/src/ppp/nm-pppd-plugin.c +++ b/src/ppp/nm-pppd-plugin.c @@ -311,7 +311,6 @@ get_credentials (char *username, char *password) { const char *my_username = NULL; const char *my_password = NULL; - size_t len; GVariant *ret; GError *err = NULL; @@ -343,21 +342,11 @@ get_credentials (char *username, char *password) g_variant_get (ret, "(&s&s)", &my_username, &my_password); - if (my_username) { - len = strlen (my_username) + 1; - len = len < MAXNAMELEN ? len : MAXNAMELEN; + if (my_username) + g_strlcpy (username, my_username, MAXNAMELEN); - strncpy (username, my_username, len); - username[len - 1] = '\0'; - } - - if (my_password) { - len = strlen (my_password) + 1; - len = len < MAXSECRETLEN ? len : MAXSECRETLEN; - - strncpy (password, my_password, len); - password[len - 1] = '\0'; - } + if (my_password) + g_strlcpy (password, my_password, MAXSECRETLEN); g_variant_unref (ret);