shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-22 22:03:43 +03:00
Code

core: don't hit an assert when printing status messages about units with overly long description strings

Browse Source 
This essentially reverts one part of d054f0a4d451120c26494263fc4dc175bfd405b1.

(We might also choose to use proper ellipsation here, but I wasn't sure the
memory allocation this requires wouöld be a good idea here...)

Fixes: #4534
This commit is contained in:
Lennart Poettering 2016-11-02 12:02:53 -06:00 committed by Zbigniew Jędrzejewski-Szmek
parent 0cc6064c3c
commit 07ecca0dc9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/job.c
View File

@ -767,8 +767,9 @@ static void job_log_status_message(Unit *u, JobType t, JobResult result) {
if (!format) if (!format)
return; return;
/* The description might be longer than the buffer, but that's OK, we'll just truncate it here */
DISABLE_WARNING_FORMAT_NONLITERAL; DISABLE_WARNING_FORMAT_NONLITERAL;
xsprintf(buf, format, unit_description(u)); snprintf(buf, sizeof(buf), format, unit_description(u));
REENABLE_WARNING; REENABLE_WARNING;
switch (t) { switch (t) {