diff options
author | Lennart Poettering <lennart@poettering.net> | 2014-10-24 18:33:29 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2014-10-24 18:33:29 +0200 |
commit | 0b76b4d8c28e8d82422ddeea2cc3c079fe4bb3dc (patch) | |
tree | 3e29b066fbdfb532ab25db02e72a0511452409ba | |
parent | 69f0081748fb4be1b7b772815e5c4202cdb88d3d (diff) |
calendar: make freeing a calendar spec object deal fine with NULL
In order to make object destruction easier (in particular in combination
with _cleanup_) we usually make destructors deal with NULL objects as
NOPs. Change the calendar spec destructor to follow the same scheme.
-rw-r--r-- | src/core/load-fragment.c | 3 | ||||
-rw-r--r-- | src/shared/calendarspec.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 6b6f9908b5..e193a67dcd 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1366,8 +1366,7 @@ int config_parse_timer(const char *unit, v = new0(TimerValue, 1); if (!v) { - if (c) - calendar_spec_free(c); + calendar_spec_free(c); return log_oom(); } diff --git a/src/shared/calendarspec.c b/src/shared/calendarspec.c index 69b7427232..4ac74ab0a2 100644 --- a/src/shared/calendarspec.c +++ b/src/shared/calendarspec.c @@ -35,7 +35,9 @@ static void free_chain(CalendarComponent *c) { } void calendar_spec_free(CalendarSpec *c) { - assert(c); + + if (!c) + return; free_chain(c->year); free_chain(c->month); |