dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30040 from yuwata/assert-return-fixes

Browse Source 
several assert_return() fixes
This commit is contained in:
Frantisek Sumsal
2023-11-15 21:05:06 +00:00
committed by GitHub
parent 59c8afbc89 aecedc48a6
commit 1fa20dde9f
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libsystemd-network/sd-dhcp-lease.c
View File

@@ -931,7 +931,10 @@ int dhcp_lease_parse_search_domains(const uint8_t *option, size_t len, char ***d
int r;
assert(domains);
assert_return(option && len > 0, -ENODATA);
assert(option || len == 0);
if (len == 0)
return -EBADMSG;
while (pos < len) {
_cleanup_free_ char *name = NULL;

4
src/libsystemd-network/test-sd-dhcp-lease.c
View File

@@ -60,8 +60,8 @@ TEST(dhcp_lease_parse_search_domains_no_data) {
_cleanup_strv_free_ char **domains = NULL;
static const uint8_t optionbuf[3] = {0, 0, 0};
assert_se(dhcp_lease_parse_search_domains(NULL, 0, &domains) == -ENODATA);
assert_se(dhcp_lease_parse_search_domains(optionbuf, 0, &domains) == -ENODATA);
assert_se(dhcp_lease_parse_search_domains(NULL, 0, &domains) == -EBADMSG);
assert_se(dhcp_lease_parse_search_domains(optionbuf, 0, &domains) == -EBADMSG);
}
TEST(dhcp_lease_parse_search_domains_loops) {

9
src/libsystemd/sd-device/sd-device.c
View File

@@ -422,8 +422,13 @@ _public_ int sd_device_new_from_subsystem_sysname(
int r;
assert_return(ret, -EINVAL);
assert_return(path_is_normalized(subsystem), -EINVAL);
assert_return(path_is_normalized(sysname), -EINVAL);
assert_return(subsystem, -EINVAL);
assert_return(sysname, -EINVAL);
if (!path_is_normalized(subsystem))
return -EINVAL;
if (!path_is_normalized(sysname))
return -EINVAL;
/* translate sysname back to sysfs filename */
name = strdupa_safe(sysname);

4
src/network/netdev/netdev.c
View File

@@ -739,6 +739,10 @@ static int netdev_request_to_create(NetDev *netdev) {
int r;
assert(netdev);
assert(netdev->manager);
if (netdev->manager->test_mode)
return 0;
if (netdev_is_stacked(netdev))
return 0;