]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
bus-unit-util: insist on full initialization
authorLennart Poettering <lennart@poettering.net>
Wed, 6 Mar 2019 18:19:38 +0000 (19:19 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 13 Mar 2019 16:38:43 +0000 (17:38 +0100)
src/shared/bus-unit-util.c

index e753eafd85af436a373153b71d8c540d7a044adc..a25e82e0176d6191d32745b5c9e90bb43b037dc2 100644 (file)
@@ -1987,6 +1987,7 @@ finish:
 
 static int check_wait_response(BusWaitForJobs *d, bool quiet, const char* const* extra_args) {
         assert(d);
+        assert(d->name);
         assert(d->result);
 
         if (!quiet) {
@@ -2055,14 +2056,14 @@ int bus_wait_for_jobs(BusWaitForJobs *d, bool quiet, const char* const* extra_ar
                 if (q < 0)
                         return log_error_errno(q, "Failed to wait for response: %m");
 
-                if (d->result) {
+                if (d->name && d->result) {
                         q = check_wait_response(d, quiet, extra_args);
                         /* Return the first error as it is most likely to be
                          * meaningful. */
                         if (q < 0 && r == 0)
                                 r = q;
 
-                        log_debug_errno(q, "Got result %s/%m for job %s", strna(d->result), strna(d->name));
+                        log_debug_errno(q, "Got result %s/%m for job %s", d->result, d->name);
                 }
 
                 d->name = mfree(d->name);