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

libnm: ensure stable behavior in _nm_ip_route_attribute_validate_all()

Browse source 
Check the attributes in a defined, stable order. This is necessary,
so that consistently the same error gets reported.
This commit is contained in:
Thomas Haller 2020-06-06 20:49:48 +02:00
parent 19b6d38932
commit bb6c2d7371
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libnm-core/nm-setting-ip-config.c
View file

@ -1363,9 +1363,12 @@ nm_ip_route_attribute_validate (const char *name,
gboolean gboolean
_nm_ip_route_attribute_validate_all (const NMIPRoute *route, GError **error) _nm_ip_route_attribute_validate_all (const NMIPRoute *route, GError **error)
{ {
GHashTableIter iter; NMUtilsNamedValue attrs_static[G_N_ELEMENTS (ip_route_attribute_spec)];
const char *key; gs_free NMUtilsNamedValue *attrs_free = NULL;
const NMUtilsNamedValue *attrs;
guint attrs_len;
GVariant *val; GVariant *val;
guint i;
guint8 u8; guint8 u8;
g_return_val_if_fail (route, FALSE); g_return_val_if_fail (route, FALSE);
@ -1374,9 +1377,15 @@ _nm_ip_route_attribute_validate_all (const NMIPRoute *route, GError **error)
if (!route->attributes) if (!route->attributes)
return TRUE; return TRUE;
g_hash_table_iter_init (&iter, route->attributes); attrs = nm_utils_named_values_from_strdict (route->attributes,
while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &val)) { &attrs_len,
if (!nm_ip_route_attribute_validate (key, val, route->family, NULL, error)) attrs_static,
&attrs_free);
for (i = 0; i < attrs_len; i++) {
const char *key = attrs[i].name;
GVariant *val2 = attrs[i].value_ptr;
if (!nm_ip_route_attribute_validate (key, val2, route->family, NULL, NULL))
return FALSE; return FALSE;
} }