diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-08-19 14:46:52 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-08-23 10:51:18 +0200 |
| commit | c5682d601b14da72db1ad01f9e2a426d716d7265 (patch) | |
| tree | 53b9eb3ab1282647f9e7d0e78cc0aa23b2583f66 | |
| parent | ed7f832c40350cce0a33c29d36c84781b4ac9434 (diff) | |
| download | NetworkManager-c5682d601b14da72db1ad01f9e2a426d716d7265.tar.gz | |
core: downgrade assertion in nm-ip[46]-config.c to g_critical
| -rw-r--r-- | src/nm-ip4-config.c | 4 | ||||
| -rw-r--r-- | src/nm-ip6-config.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 7ef9fc5bb5..22d1d0775c 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -1614,7 +1614,7 @@ nm_ip4_config_add_route (NMIP4Config *config, const NMPlatformIP4Route *new) g_return_if_fail (new != NULL); g_return_if_fail (new->plen > 0 && new->plen <= 32); - g_assert (priv->ifindex); + g_return_if_fail (priv->ifindex > 0); for (i = 0; i < priv->routes->len; i++ ) { NMPlatformIP4Route *item = &g_array_index (priv->routes, NMPlatformIP4Route, i); @@ -2293,7 +2293,7 @@ finalize (GObject *object) static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMIP4Config *config = NM_IP4_CONFIG (object); NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (config); diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 83cd8af0c2..ac9e6cd130 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -1487,7 +1487,7 @@ nm_ip6_config_add_route (NMIP6Config *config, const NMPlatformIP6Route *new) g_return_if_fail (new != NULL); g_return_if_fail (new->plen > 0 && new->plen <= 128); - g_assert (priv->ifindex); + g_return_if_fail (priv->ifindex > 0); for (i = 0; i < priv->routes->len; i++ ) { NMPlatformIP6Route *item = &g_array_index (priv->routes, NMPlatformIP6Route, i); @@ -2037,7 +2037,7 @@ nameservers_to_gvalue (GArray *array, GValue *value) static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMIP6Config *config = NM_IP6_CONFIG (object); NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (config); |