From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 1 Apr 2013 01:26:38 +0000 (+0200)
Subject: bus: always return something in sd_bus_get_timeout()
X-Git-Tag: v201~103
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=adee69fa7a26df2f1b63cb813c1074f51a2a2612;p=elogind.git

bus: always return something in sd_bus_get_timeout()
---

diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c
index 4f004add2..0964649e3 100644
--- a/src/libsystemd-bus/sd-bus.c
+++ b/src/libsystemd-bus/sd-bus.c
@@ -1425,12 +1425,16 @@ int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) {
                 return 1;
         }
 
-        if (bus->state != BUS_RUNNING && bus->state != BUS_HELLO)
+        if (bus->state != BUS_RUNNING && bus->state != BUS_HELLO) {
+                *timeout_usec = (uint64_t) -1;
                 return 0;
+        }
 
         c = prioq_peek(bus->reply_callbacks_prioq);
-        if (!c)
+        if (!c) {
+                *timeout_usec = (uint64_t) -1;
                 return 0;
+        }
 
         *timeout_usec = c->timeout;
         return 1;