From 7410616cd9dbbec97cf98d75324da5cda2b2f7a2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 30 Apr 2015 20:21:00 +0200 Subject: core: rework unit name validation and manipulation logic A variety of changes: - Make sure all our calls distuingish OOM from other errors if OOM is not the only error possible. - Be much stricter when parsing escaped paths, do not accept trailing or leading escaped slashes. - Change unit validation to take a bit mask for allowing plain names, instance names or template names or an combination thereof. - Refuse manipulating invalid unit name --- src/debug-generator/debug-generator.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/debug-generator') diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c index 1b9019325c..9d0ab06e2f 100644 --- a/src/debug-generator/debug-generator.c +++ b/src/debug-generator/debug-generator.c @@ -41,9 +41,9 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { else { char *n; - n = unit_name_mangle(value, MANGLE_NOGLOB); - if (!n) - return log_oom(); + r = unit_name_mangle(value, UNIT_NAME_NOGLOB, &n); + if (r < 0) + return log_error_errno(r, "Failed to glob unit name: %m"); r = strv_consume(&arg_mask, n); if (r < 0) @@ -57,9 +57,9 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { else { char *n; - n = unit_name_mangle(value, MANGLE_NOGLOB); - if (!n) - return log_oom(); + r = unit_name_mangle(value, UNIT_NAME_NOGLOB, &n); + if (r < 0) + return log_error_errno(r, "Failed to glob unit name: %m"); r = strv_consume(&arg_wants, n); if (r < 0) -- cgit v1.2.3-54-g00ecf