projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4af273d
)
timesyncd: properly handle OOM errors when parsing fallback servers (#6047)
author
Lennart Poettering
<lennart@poettering.net>
Tue, 30 May 2017 12:49:35 +0000
(14:49 +0200)
committer
GitHub
<noreply@github.com>
Tue, 30 May 2017 12:49:35 +0000
(14:49 +0200)
src/timesync/timesyncd.c
patch
|
blob
|
history
diff --git
a/src/timesync/timesyncd.c
b/src/timesync/timesyncd.c
index
052329f
..
ff90f04
100644
(file)
--- 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,