Skip to content

fix(rust): do not crash on empty vectors in IpConfig #2371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imobachgs merged 2 commits into from
May 19, 2025
Merged

fix(rust): do not crash on empty vectors in IpConfig #2371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c203765
fix(rust): do not crash on empty vectors in IpConfig
imobachgs May 19, 2025
cf2babb
docs(rust): update changes file
imobachgs May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions rust/agama-network/src/model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,22 +803,22 @@ impl From<InvalidMacAddress> 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<IpInet>,
#[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<IpAddr>,
#[serde(skip_serializing_if = "Vec::is_empty")]
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub dns_searchlist: Vec<String>,
pub ignore_auto_dns: bool,
#[schema(schema_with = schemas::ip_addr)]
pub gateway4: Option<IpAddr>,
#[schema(schema_with = schemas::ip_addr)]
pub gateway6: Option<IpAddr>,
#[serde(skip_serializing_if = "Vec::is_empty")]
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub routes4: Vec<IpRoute>,
#[serde(skip_serializing_if = "Vec::is_empty")]
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub routes6: Vec<IpRoute>,
pub dhcp4_settings: Option<Dhcp4Settings>,
pub dhcp6_settings: Option<Dhcp6Settings>,
Expand Down
7 changes: 7 additions & 0 deletions rust/package/agama.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon May 19 14:02:04 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>

- 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 <igonzalezsosa@suse.com>

Expand Down