]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #11252 from evverx/use-asan-wrapper-on-travis-ci
authorFrantisek Sumsal <frantisek@sumsal.cz>
Sun, 6 Jan 2019 17:48:38 +0000 (18:48 +0100)
committerGitHub <noreply@github.com>
Sun, 6 Jan 2019 17:48:38 +0000 (18:48 +0100)
travis: run PID1, journald and everything else under ASan+UBsan

1  2 
src/core/main.c
src/journal/journald-context.c

diff --cc src/core/main.c
Simple merge
index e84e5117b80224044ecf4347fd900f2b576adf7d,2d711bc8244cafc41c4ecfc11b921abee60a208b..80bbc34e3706e33bfa1f5d88988c11803f4c8c4c
@@@ -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)