diff options
author | Thomas Haller <thaller@redhat.com> | 2019-08-25 15:27:30 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2019-08-26 13:05:50 +0200 |
commit | 3a5d2c91dead2b629f73f64198ba645ba454bff1 (patch) | |
tree | f7c7a29b694ca602582e24af1e567da468ae8e6f | |
parent | 942a960c13b1900adceb30b70ccf808b678d41ff (diff) | |
download | NetworkManager-3a5d2c91dead2b629f73f64198ba645ba454bff1.tar.gz |
libnm: use size_t variable for strlen() result in "nm-setting-gsm.c"'s verify()
-rw-r--r-- | libnm-core/nm-setting-gsm.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libnm-core/nm-setting-gsm.c b/libnm-core/nm-setting-gsm.c index bf2e7b2330..a4049d1742 100644 --- a/libnm-core/nm-setting-gsm.c +++ b/libnm-core/nm-setting-gsm.c @@ -287,8 +287,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } if (priv->apn) { - guint32 apn_len = strlen (priv->apn); - guint32 i; + gsize apn_len = strlen (priv->apn); + gsize i; if (apn_len < 1 || apn_len > 64) { g_set_error (error, @@ -334,7 +334,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } } - if (priv->username && !strlen (priv->username)) { + if ( priv->username + && priv->username[0] == '\0') { g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -344,8 +345,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } if (priv->network_id) { - guint32 nid_len = strlen (priv->network_id); - guint32 i; + gsize nid_len = strlen (priv->network_id); + gsize i; /* Accept both 5 and 6 digit MCC/MNC codes */ if ((nid_len < 5) || (nid_len > 6)) { |