diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-04-27 12:00:06 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-05-17 15:22:16 +0200 |
| commit | af0d30d5c8d6980c3612ed2e0bef8691f936049c (patch) | |
| tree | 7d651e18650fba9a9cd8eae5ad0fb6d5e9b44f94 /src/libelogind/sd-event | |
| parent | 58172968ad2f9a350172f062cc459d070569916d (diff) | |
Prep v229: Add missing fixes from upstream [3/6] src/libelogind
Diffstat (limited to 'src/libelogind/sd-event')
| -rw-r--r-- | src/libelogind/sd-event/sd-event.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/libelogind/sd-event/sd-event.c b/src/libelogind/sd-event/sd-event.c index b14e859c7..e32507942 100644 --- a/src/libelogind/sd-event/sd-event.c +++ b/src/libelogind/sd-event/sd-event.c @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** This file is part of systemd. @@ -466,7 +464,9 @@ fail: } _public_ sd_event* sd_event_ref(sd_event *e) { - assert_return(e, NULL); + + if (!e) + return NULL; assert(e->n_ref >= 1); e->n_ref++; @@ -665,8 +665,10 @@ static int event_make_signal_data( d->priority = priority; r = hashmap_put(e->signal_data, &d->priority, d); - if (r < 0) + if (r < 0) { + free(d); return r; + } added = true; } @@ -1367,7 +1369,9 @@ _public_ int sd_event_add_exit( #if 0 /// UNNEEDED by elogind _public_ sd_event_source* sd_event_source_ref(sd_event_source *s) { - assert_return(s, NULL); + + if (!s) + return NULL; assert(s->n_ref >= 1); s->n_ref++; |