29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
From 7172a79bd8e8f8e04548905ccd68d3990347104d Mon Sep 17 00:00:00 2001
|
|
From: reverendhomer <mk.43.ecko@gmail.com>
|
|
Date: Sat, 8 Aug 2015 09:49:39 +0300
|
|
Subject: [PATCH 28/47] Coverity #1299015
|
|
|
|
bus can never be NULL due to assert
|
|
---
|
|
src/libsystemd/sd-bus/bus-message.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
|
|
index 983e2f6..5843886 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);
|
|
|
|
--
|
|
2.5.0
|
|
|