From a4fc96c823043df0dfba6823524a6f9df35bd5ac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 3 Aug 2019 17:46:56 +0200 Subject: [PATCH] pid1: replace asprintf() with strjoin() It's nicer. And coverity doesn't need to complain about unchecked return value (CID#1401780). --- src/core/dbus-execute.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index c816569f2b6..85c310cd33d 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -1000,16 +1000,11 @@ int bus_property_get_exec_ex_command_list( } static char *exec_command_flags_to_exec_chars(ExecCommandFlags flags) { - char *res = NULL; - - asprintf(&res, "%s%s%s%s%s", - FLAGS_SET(flags, EXEC_COMMAND_IGNORE_FAILURE) ? "-" : "", - FLAGS_SET(flags, EXEC_COMMAND_NO_ENV_EXPAND) ? ":" : "", - FLAGS_SET(flags, EXEC_COMMAND_FULLY_PRIVILEGED) ? "+" : "", - FLAGS_SET(flags, EXEC_COMMAND_NO_SETUID) ? "!" : "", - FLAGS_SET(flags, EXEC_COMMAND_AMBIENT_MAGIC) ? "!!" : ""); - - return res; + return strjoin(FLAGS_SET(flags, EXEC_COMMAND_IGNORE_FAILURE) ? "-" : "", + FLAGS_SET(flags, EXEC_COMMAND_NO_ENV_EXPAND) ? ":" : "", + FLAGS_SET(flags, EXEC_COMMAND_FULLY_PRIVILEGED) ? "+" : "", + FLAGS_SET(flags, EXEC_COMMAND_NO_SETUID) ? "!" : "", + FLAGS_SET(flags, EXEC_COMMAND_AMBIENT_MAGIC) ? "!!" : ""); } int bus_set_transient_exec_command( -- 2.47.3