shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-04 21:47:31 +03:00
Code

job: truncate unit description

Browse Source 
The comment above says we're truncating the string but that's not true,
an assert will fail in xsprintf if the description is longer than
LINE_MAX.

Let's use snprintf instead of xsprintf to make sure it's truncated.
We'll cast its result to void to tell static checkers we're fine with
truncation.
This commit is contained in:
Iago López Galeiras 2018-02-16 14:32:44 +01:00 committed by Lennart Poettering
parent 9371f858a5
commit 574432f889
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/job.c
View File

@ -776,9 +776,12 @@ 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 */ /* The description might be longer than the buffer, but that's OK,
* we'll just truncate it here. Note that we use snprintf() rather than
* xsprintf() on purpose here: we are fine with truncation and don't
* consider that an error. */
DISABLE_WARNING_FORMAT_NONLITERAL; DISABLE_WARNING_FORMAT_NONLITERAL;
xsprintf(buf, format, unit_description(u)); (void) snprintf(buf, sizeof(buf), format, unit_description(u));
REENABLE_WARNING; REENABLE_WARNING;
switch (t) { switch (t) {