diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2015-09-05 12:56:04 +0200 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2015-09-05 12:56:04 +0200 |
| commit | 3d1c455f9a898e7427b642800644ae7142dc7557 (patch) | |
| tree | a70835445cb39c5e48ec9c69a74b5d403a25196a /src/login/logind-dbus.c | |
| parent | c9912c5eafa03fdf53e569eaf2e89d7e0932975b (diff) | |
login: fix NULL-deref on wall_message
We treat an empty wall-message equal to a NULL wall-message since:
commit 5744f59a3ee883ef3a78214bd5236157acdc35ba
Author: Lennart Poettering <lennart@poettering.net>
Date: Fri Sep 4 10:34:47 2015 +0200
logind: treat an empty wall message like a NULL one
Fix the shutdown scheduler to not deref a NULL pointer, but properly
check for an empty wall-message.
Fixes: #1120
Diffstat (limited to 'src/login/logind-dbus.c')
| -rw-r--r-- | src/login/logind-dbus.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 7cc68d4865..e433549cb9 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1796,9 +1796,11 @@ static int update_schedule_file(Manager *m) { if (r < 0) return log_error_errno(r, "Failed to create shutdown subdirectory: %m"); - t = cescape(m->wall_message); - if (!t) - return log_oom(); + if (!isempty(m->wall_message)) { + t = cescape(m->wall_message); + if (!t) + return log_oom(); + } r = fopen_temporary("/run/systemd/shutdown/scheduled", &f, &temp_path); if (r < 0) @@ -1814,7 +1816,7 @@ static int update_schedule_file(Manager *m) { m->enable_wall_messages, m->scheduled_shutdown_type); - if (!isempty(m->wall_message)) + if (t) fprintf(f, "WALL_MESSAGE=%s\n", t); r = fflush_and_check(f); |