From: reverendhomer <mk.43.ecko@gmail.com>
Date: Sat, 8 Aug 2015 06:49:39 +0000 (+0300)
Subject: Coverity #1299015
X-Git-Tag: v225~84^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37286ade90619bbce3a445dd3dcabe5d8ba21342;p=platform%2Fupstream%2Fsystemd.git

Coverity #1299015

bus can never be NULL due to assert
---

diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index 006e4a2..94427ed 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -608,8 +608,8 @@ static sd_bus_message *message_new(sd_bus *bus, uint8_t type) {
         m->header = (struct bus_header*) ((uint8_t*) m + ALIGN(sizeof(struct sd_bus_message)));
         m->header->endian = BUS_NATIVE_ENDIAN;
         m->header->type = type;
-        m->header->version = bus ? bus->message_version : 1;
-        m->allow_fds = !bus || bus->can_fds || (bus->state != BUS_HELLO && bus->state != BUS_RUNNING);
+        m->header->version = bus->message_version;
+        m->allow_fds = bus->can_fds || (bus->state != BUS_HELLO && bus->state != BUS_RUNNING);
         m->root_container.need_offsets = BUS_MESSAGE_IS_GVARIANT(m);
         m->bus = sd_bus_ref(bus);