Attachment 128259 Details for Bug 98666 – activation test: don't crash if AppArmor is built but unavailable

[patch] activation test: don't crash if AppArmor is built but unavailable

0001-activation-test-don-t-crash-if-AppArmor-is-built-but.patch (text/plain), 988 bytes, created by Simon McVittie on 2016-11-29 01:01:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2016-11-29 01:01:06 UTC

Size: 988 bytes

patch

obsolete

>From 4650d96ea6bc10d4cbfe2d0926242136ea722bb2 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@debian.org>
>Date: Tue, 29 Nov 2016 00:48:14 +0000
>Subject: [PATCH] activation test: don't crash if AppArmor is built but
> unavailable
>
>Also don't try to clean up a process we didn't start.
>
>Signed-off-by: Simon McVittie <smcv@debian.org>
>---
> test/sd-activation.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
>diff --git a/test/sd-activation.c b/test/sd-activation.c
>index 24ac210..810d622 100644
>--- a/test/sd-activation.c
>+++ b/test/sd-activation.c
>@@ -801,9 +801,15 @@ teardown (Fixture *f,
>       f->activated = NULL;
>     }
> 
>-  test_kill_pid (f->daemon_pid);
>-  g_spawn_close_pid (f->daemon_pid);
>-  test_main_context_unref (f->ctx);
>+  if (f->daemon_pid != 0)
>+    {
>+      test_kill_pid (f->daemon_pid);
>+      g_spawn_close_pid (f->daemon_pid);
>+    }
>+
>+  if (f->ctx != NULL)
>+    test_main_context_unref (f->ctx);
>+
>   g_free (f->address);
> }
> 
>-- 
>2.10.2
>

Actions: View | Splinter Review

Attachments on bug 98666: 127875 | 127876 | 127877 | 127878 | 127879 | 127880 | 127881 | 128111 | 128112 | 128113 | 128114 | 128115 | 128142 | 128243 | 128259

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.