From: Frantisek Sumsal Date: Sun, 6 Jan 2019 17:48:38 +0000 (+0100) Subject: Merge pull request #11252 from evverx/use-asan-wrapper-on-travis-ci X-Git-Tag: v241-rc1~114 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a2c3dc318fab4e3cbe33e9835372f67e5114d54;p=thirdparty%2Fsystemd.git Merge pull request #11252 from evverx/use-asan-wrapper-on-travis-ci travis: run PID1, journald and everything else under ASan+UBsan --- 4a2c3dc318fab4e3cbe33e9835372f67e5114d54 diff --cc src/journal/journald-context.c index e84e5117b80,2d711bc8244..80bbc34e370 --- a/src/journal/journald-context.c +++ b/src/journal/journald-context.c @@@ -254,10 -254,9 +254,9 @@@ static int client_context_read_cgroup(S /* Try to acquire the current cgroup path */ r = cg_pid_get_path_shifted(c->pid, s->cgroup_root, &t); if (r < 0 || empty_or_root(t)) { - /* We use the unit ID passed in as fallback if we have nothing cached yet and cg_pid_get_path_shifted() * failed or process is running in a root cgroup. Zombie processes are automatically migrated to root cgroup - * on cgroupsv1 and we want to be able to map log messages from them too. */ + * on cgroup v1 and we want to be able to map log messages from them too. */ if (unit_id && !c->unit) { c->unit = strdup(unit_id); if (c->unit)