ppp/plugin: use g_strlcpy()

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=]"
This commit is contained in:
Lubomir Rintel 2018-02-12 17:42:25 +00:00
parent 7f847d71f3
commit 85c0dc4a92

View file

@ -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);