mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-02-12 21:57:27 +03:00
verify: fix segmentation fault
systemd-analyze verify command now results in segmentation fault if two consecutive non-existent unit file names are given: # ./build/systemd-analyze a.service b.service ...<snip irrelevant part>... Unit a.service not found. Unit b.service not found. Segmentation fault (core dumped) The cause of this is a wrong handling of return value of manager_load_startable_unit_or_warn() in verify_units() in failure case. It looks that the current logic wants to assign the first error status throughout verify_units() into variable r and count up variable count only when a given unit file exists. However, due to the wrong handling of the return value of manager_load_startable_unit_or_warn() in verify_units(), the variable count is unexpectedly incremented even when there is no such unit file because the variable r already contains non-zero value in the 2nd failure, set by the 1st failure, and then the condition k < 0 && r == 0 evaluates to false. This commit fixes the wrong handling of return value of manager_load_startable_unit_or_warn() in verify_units(). (cherry picked from commit fc9de36a3b60c69a17442aabf215e2d87e697e6f)
This commit is contained in:
parent
3aea728cd2
commit
a87e8fdc72
@ -271,10 +271,13 @@ int verify_units(char **filenames, UnitFileScope scope, bool check_man, bool run
|
||||
}
|
||||
|
||||
k = manager_load_startable_unit_or_warn(m, NULL, prepared, &units[count]);
|
||||
if (k < 0 && r == 0)
|
||||
r = k;
|
||||
else
|
||||
count++;
|
||||
if (k < 0) {
|
||||
if (r == 0)
|
||||
r = k;
|
||||
continue;
|
||||
}
|
||||
|
||||
count++;
|
||||
}
|
||||
|
||||
for (i = 0; i < count; i++) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user