diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-09 18:46:48 +0200 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-12 03:26:07 +0200 |
commit | 065364920281e1cf59cab989e17aff21790505c4 (patch) | |
tree | eb7c2c1045de0b868d706a1b68d6d3e4e0aac394 /src/core/unit-printf.c | |
parent | dns-domain: use DNS_LABEL_MAX at one more place (diff) | |
download | systemd-065364920281e1cf59cab989e17aff21790505c4.tar.xz systemd-065364920281e1cf59cab989e17aff21790505c4.zip |
tree-wide: refuse too long strings earlier in specifier_printf()
We usually call specifier_printf() and then check the validity of
the result. In many cases, validity checkers, e.g. path_is_valid(),
refuse too long strings. This makes specifier_printf() refuse such
long results earlier.
Moreover, unit_full_string() and description field in sysuser now
refuse results longer than LONG_LINE_MAX. config_parse() already
refuses the line longer than LONG_LINE_MAX. Hence, it should be ok
to set the same value as the maximum length of the resolved string.
Diffstat (limited to 'src/core/unit-printf.c')
-rw-r--r-- | src/core/unit-printf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c index 8e50a81b97..ee8b0b3de8 100644 --- a/src/core/unit-printf.c +++ b/src/core/unit-printf.c @@ -201,10 +201,10 @@ int unit_name_printf(const Unit *u, const char* format, char **ret) { assert(format); assert(ret); - return specifier_printf(format, table, u, ret); + return specifier_printf(format, UNIT_NAME_MAX, table, u, ret); } -int unit_full_printf(const Unit *u, const char *format, char **ret) { +int unit_full_printf_full(const Unit *u, const char *format, size_t max_length, char **ret) { /* This is similar to unit_name_printf() but also supports unescaping. Also, adds a couple of additional codes * (which are likely not suitable for unescaped inclusion in unit names): * @@ -265,5 +265,5 @@ int unit_full_printf(const Unit *u, const char *format, char **ret) { {} }; - return specifier_printf(format, table, u, ret); + return specifier_printf(format, max_length, table, u, ret); } |