From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 24 May 2012 15:33:50 +0000 (+0200)
Subject: swap: avoid bad memory access
X-Git-Tag: v183^0
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6bfc7bbee5132d60e37dfbafeb59ef5651d536b;p=systemd

swap: avoid bad memory access
---

diff --git a/src/core/swap.c b/src/core/swap.c
index f677d65b..e7ed1b88 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -535,25 +535,30 @@ static void swap_dump(Unit *u, FILE *f, const char *prefix) {
                 p = &s->parameters_proc_swaps;
         else if (s->from_fragment)
                 p = &s->parameters_fragment;
+        else
+                p = NULL;
 
         fprintf(f,
                 "%sSwap State: %s\n"
                 "%sResult: %s\n"
                 "%sWhat: %s\n"
-                "%sPriority: %i\n"
-                "%sNoAuto: %s\n"
-                "%sNoFail: %s\n"
                 "%sFrom /proc/swaps: %s\n"
                 "%sFrom fragment: %s\n",
                 prefix, swap_state_to_string(s->state),
                 prefix, swap_result_to_string(s->result),
                 prefix, s->what,
-                prefix, p->priority,
-                prefix, yes_no(p->noauto),
-                prefix, yes_no(p->nofail),
                 prefix, yes_no(s->from_proc_swaps),
                 prefix, yes_no(s->from_fragment));
 
+        if (p)
+                fprintf(f,
+                        "%sPriority: %i\n"
+                        "%sNoAuto: %s\n"
+                        "%sNoFail: %s\n",
+                        prefix, p->priority,
+                        prefix, yes_no(p->noauto),
+                        prefix, yes_no(p->nofail));
+
         if (s->control_pid > 0)
                 fprintf(f,
                         "%sControl PID: %lu\n",