]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
only check signature job error if signature job exists (#6118)
authortblume <Thomas.Blume@suse.com>
Wed, 21 Jun 2017 17:29:58 +0000 (19:29 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 21 Jun 2017 17:29:58 +0000 (19:29 +0200)
otherwise it will segfault when accessing signature jobs error status

src/import/pull-raw.c
src/import/pull-tar.c

index a15eac1f1fe865640981a4d8d0d897e1e94e9fd0..974e42d7ce37eccd4fe390ee7d55fe220350bf51 100644 (file)
@@ -498,7 +498,7 @@ static void raw_pull_job_on_finished(PullJob *j) {
         if (!raw_pull_is_done(i))
                 return;
 
-        if (i->checksum_job->style == VERIFICATION_PER_DIRECTORY && i->signature_job->error != 0) {
+        if (i->signature_job && i->checksum_job->style == VERIFICATION_PER_DIRECTORY && i->signature_job->error != 0) {
                 log_error_errno(j->error, "Failed to retrieve signature file, cannot verify. (Try --verify=no?)");
 
                 r = i->signature_job->error;
index d4b599ba95144b7ff097dd04a07ac0d9c82e8a32..16ce901650274a156d099eb2bb9b3b024ec91341 100644 (file)
@@ -315,7 +315,7 @@ static void tar_pull_job_on_finished(PullJob *j) {
         if (!tar_pull_is_done(i))
                 return;
 
-        if (i->checksum_job->style == VERIFICATION_PER_DIRECTORY && i->signature_job->error != 0) {
+        if (i->signature_job && i->checksum_job->style == VERIFICATION_PER_DIRECTORY && i->signature_job->error != 0) {
                 log_error_errno(j->error, "Failed to retrieve signature file, cannot verify. (Try --verify=no?)");
 
                 r = i->signature_job->error;