diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-05-30 14:49:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-30 14:49:35 +0200 |
| commit | c4c069121cbd5f882ef2e7effba5cdd3673c0a1f (patch) | |
| tree | 7d469b9b5b9b5604c50e6b5e1205ea7f484186e8 /src/timesync/timesyncd.c | |
| parent | 4af273d1492ed837f9c2bb97c40f617d2c9dacdb (diff) | |
| download | systemd-c4c069121cbd5f882ef2e7effba5cdd3673c0a1f.tar.gz | |
timesyncd: properly handle OOM errors when parsing fallback servers (#6047)
Diffstat (limited to 'src/timesync/timesyncd.c')
| -rw-r--r-- | src/timesync/timesyncd.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c index 052329f61e..ff90f04070 100644 --- a/src/timesync/timesyncd.c +++ b/src/timesync/timesyncd.c @@ -132,7 +132,11 @@ int main(int argc, char *argv[]) { if (r < 0) log_warning_errno(r, "Failed to parse configuration file: %m"); - assert_se(manager_parse_fallback_string(m, NTP_SERVERS) >= 0); + r = manager_parse_fallback_string(m, NTP_SERVERS); + if (r < 0) { + log_error_errno(r, "Failed to parse fallback server strings: %m"); + goto finish; + } log_debug("systemd-timesyncd running as pid " PID_FMT, getpid()); sd_notify(false, |