event: fix crash on child-source state modifications

[elogind.git] / src / libsystemd / sd-event / sd-event.c

diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index f33a9ecf9ac8dee1b8d6ba4f74c68429d120ad9e..cf2efa68a35c9c4bc21dc9a387177ad20e40720e 100644 (file)
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -1286,8 +1286,6 @@ _public_ int sd_event_source_set_enabled(sd_event_source *s, int m) {
                         break;
 
                 case SOURCE_CHILD:
                         break;
 
                 case SOURCE_CHILD:

-                        s->enabled = m;
-

                         if (s->enabled == SD_EVENT_OFF) {
                                 s->event->n_enabled_child_sources++;
 
                         if (s->enabled == SD_EVENT_OFF) {
                                 s->event->n_enabled_child_sources++;
 


@@ -1296,6 +1294,8 @@ _public_ int sd_event_source_set_enabled(sd_event_source *s, int m) {
                                         event_update_signal_fd(s->event);
                                 }
                         }
                                         event_update_signal_fd(s->event);
                                 }
                         }

+
+                        s->enabled = m;

                         break;
 
                 case SOURCE_EXIT:
                         break;
 
                 case SOURCE_EXIT: