diff options
| author | Filipe Brandenburger <filbranden@google.com> | 2018-06-12 23:20:04 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-06-25 13:16:38 +0200 |
| commit | 53a2383b8bd978cdd98debb69dea95bf0091116a (patch) | |
| tree | 0a6de6193afc534d28ae751c8f9005485a3c51e8 /src/core | |
| parent | hwdb: added accelerometer quirk for Aspire Switch 10 (sw5-011) (diff) | |
| download | systemd-53a2383b8bd978cdd98debb69dea95bf0091116a.tar.xz systemd-53a2383b8bd978cdd98debb69dea95bf0091116a.zip | |
core/job: add check for return of job_type_merge_and_collapse()
Using an assertion is fine, since calls to job_merge_into_installed()
are protected by a check for job_type_is_conflicting().
Uncovered by Coverity, fixes CID 996307.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/job.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/job.c b/src/core/job.c index 734756b666..2f37ff5bac 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -174,7 +174,7 @@ static void job_merge_into_installed(Job *j, Job *other) { assert(j->unit == other->unit); if (j->type != JOB_NOP) - job_type_merge_and_collapse(&j->type, other->type, j->unit); + assert_se(job_type_merge_and_collapse(&j->type, other->type, j->unit) == 0); else assert(other->type == JOB_NOP); |