chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86befb4
)
event: don't disarm invalid timerfd
author
Lennart Poettering
<lennart@poettering.net>
Wed, 20 Nov 2013 17:19:05 +0000
(18:19 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 20 Nov 2013 19:58:17 +0000
(20:58 +0100)
src/libsystemd-bus/sd-event.c
patch
|
blob
|
history
diff --git
a/src/libsystemd-bus/sd-event.c
b/src/libsystemd-bus/sd-event.c
index ec18af43d51f385d90ccef2bcaca8cf58bb48c02..90cdeda513b7a9239487b808d8f9ea35d533d639 100644
(file)
--- a/
src/libsystemd-bus/sd-event.c
+++ b/
src/libsystemd-bus/sd-event.c
@@
-1412,6
+1412,9
@@
static int event_arm_timer(
a = prioq_peek(earliest);
if (!a || a->enabled == SD_EVENT_OFF) {
+ if (timer_fd < 0)
+ return 0;
+
if (*next == (usec_t) -1)
return 0;