From c203765a2a51106dac4a41376066d7877bf4c2ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 19 May 2025 14:57:57 +0100 Subject: [PATCH 1/2] fix(rust): do not crash on empty vectors in IpConfig --- rust/agama-network/src/model.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rust/agama-network/src/model.rs b/rust/agama-network/src/model.rs index 2437539cd7..ad0a8a0ed1 100644 --- a/rust/agama-network/src/model.rs +++ b/rust/agama-network/src/model.rs @@ -803,22 +803,22 @@ impl From for zbus::fdo::Error { pub struct IpConfig { pub method4: Ipv4Method, pub method6: Ipv6Method, - #[serde(skip_serializing_if = "Vec::is_empty")] + #[serde(default, skip_serializing_if = "Vec::is_empty")] #[schema(schema_with = schemas::ip_inet_array)] pub addresses: Vec, - #[serde(skip_serializing_if = "Vec::is_empty")] + #[serde(default, skip_serializing_if = "Vec::is_empty")] #[schema(schema_with = schemas::ip_addr_array)] pub nameservers: Vec, - #[serde(skip_serializing_if = "Vec::is_empty")] + #[serde(default, skip_serializing_if = "Vec::is_empty")] pub dns_searchlist: Vec, pub ignore_auto_dns: bool, #[schema(schema_with = schemas::ip_addr)] pub gateway4: Option, #[schema(schema_with = schemas::ip_addr)] pub gateway6: Option, - #[serde(skip_serializing_if = "Vec::is_empty")] + #[serde(default, skip_serializing_if = "Vec::is_empty")] pub routes4: Vec, - #[serde(skip_serializing_if = "Vec::is_empty")] + #[serde(default, skip_serializing_if = "Vec::is_empty")] pub routes6: Vec, pub dhcp4_settings: Option, pub dhcp6_settings: Option, From cf2babbd4c5debd15bfc8aa6f70271dea5d81502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 19 May 2025 15:05:02 +0100 Subject: [PATCH 2/2] docs(rust): update changes file --- rust/package/agama.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rust/package/agama.changes b/rust/package/agama.changes index 46f111a53d..b3d2d089ad 100644 --- a/rust/package/agama.changes +++ b/rust/package/agama.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 19 14:02:04 UTC 2025 - Imobach Gonzalez Sosa + +- Do not crash when network events do not contain "addresses", + "nameservers", "dnsSearchlist", "routes4" or "routes6" + (gh#agama-project/agama#2371). + ------------------------------------------------------------------- Mon May 19 12:02:46 UTC 2025 - Imobach Gonzalez Sosa