diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-08-25 15:27:30 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-08-27 11:26:28 +0200 |
| commit | d32fcc93ed525d2e59a243960cc6ec8e90279535 (patch) | |
| tree | 18a64dfa92014354c91e7774e69512a025c7b929 | |
| parent | 4d515e2c9ab51d79cf405be861cb5b88d10e1169 (diff) | |
| download | NetworkManager-d32fcc93ed525d2e59a243960cc6ec8e90279535.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)) { |