picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tree-wide: Workaround -Wnonnull GCC bug 

See issue #6119
This commit is contained in:
Benjamin Robin 2020-05-06 21:24:05 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent ba876a4c8d
commit 08f468567d
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/manager.c
View File

@ -1968,7 +1968,6 @@ int manager_load_unit_prepare(
int r;
assert(m);
assert(name || path);
assert(_ret);
/* This will prepare the unit for loading, but not actually
@ -1977,8 +1976,13 @@ int manager_load_unit_prepare(
if (path && !is_path(path))
return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Path %s is not absolute.", path);
if (!name)
if (!name) {
/* 'name' and 'path' must not both be null. Check here 'path' using assert_se() to
* workaround a bug in gcc that generates a -Wnonnull warning when calling basename(),
* but this cannot be possible in any code path (See #6119). */
assert_se(path);
name = basename(path);
}
t = unit_name_to_type(name);

8
src/shared/install.c
View File

@ -1013,10 +1013,14 @@ static int install_info_add(
int r;
assert(c);
assert(name || path);
if (!name)
if (!name) {
/* 'name' and 'path' must not both be null. Check here 'path' using assert_se() to
* workaround a bug in gcc that generates a -Wnonnull warning when calling basename(),
* but this cannot be possible in any code path (See #6119). */
assert_se(path);
name = basename(path);
}
if (!unit_name_is_valid(name, UNIT_NAME_ANY))
return -EINVAL;