fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-05 15:50:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: fix bounds of connectivity_interval values

Browse source 
0 means "turn off connectivity checking", so we can't use that to
determine whether or not the interval has already been set by
command-line options or not.  Instead, store the interval
internally as a signed int and use -1 to mean "not yet set".

Second, validate input values for interval to ensure they can't
be less than 0 or more than G_MAXINT.
This commit is contained in:
Dan Williams 2013-01-31 17:32:51 -06:00
parent 06dca1b056
commit 2e0fead744
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nm-config.c
View file

@ -36,7 +36,7 @@ typedef struct {
char *log_level;
char *log_domains;
char *connectivity_uri;
guint connectivity_interval;
gint connectivity_interval;
char *connectivity_response;
} NMConfigPrivate;
@ -120,7 +120,10 @@ nm_config_get_connectivity_interval (NMConfig *config)
{
g_return_val_if_fail (config != NULL, 0);
return NM_CONFIG_GET_PRIVATE (config)->connectivity_interval;
/* We store interval as signed internally to track whether it's
* set or not, but report as unsigned to callers.
*/
return CLAMP (NM_CONFIG_GET_PRIVATE (config)->connectivity_interval, 0, G_MAXINT32);
}
const char *
@ -170,7 +173,7 @@ fill_from_file (NMConfig *config, const char *path, GError **error)
priv->connectivity_uri = g_key_file_get_value (kf, "connectivity", "uri", NULL);
if (priv->connectivity_interval < 0)
priv->connectivity_interval = g_key_file_get_integer (kf, "connectivity", "interval", NULL);
priv->connectivity_interval = CLAMP (g_key_file_get_integer (kf, "connectivity", "interval", NULL), 0, G_MAXINT32);
if (!priv->connectivity_response)
priv->connectivity_response = g_key_file_get_value (kf, "connectivity", "response", NULL);
@ -290,6 +293,7 @@ nm_config_new (const char *cli_config_path,
static void
nm_config_init (NMConfig *config)
{
NM_CONFIG_GET_PRIVATE (config)->connectivity_interval = -1;
}
static void