From 11b970d7c9e820e4d7574d0cb63ddc55cd27176e Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 7 Jan 2011 17:24:25 +0000
Subject: [PATCH] Always initialise *relroot in
 grub_find_root_device_from_mountinfo, otherwise we free an uninitialised
 pointer if /proc is unmounted. Reported by: Scott Moser.

---
 grub-core/kern/emu/getroot.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/grub-core/kern/emu/getroot.c b/grub-core/kern/emu/getroot.c
index 373834127..a4cfaffc9 100644
--- a/grub-core/kern/emu/getroot.c
+++ b/grub-core/kern/emu/getroot.c
@@ -111,13 +111,13 @@ grub_find_root_device_from_mountinfo (const char *dir, char **relroot)
   size_t len = 0;
   char *ret = NULL;
 
+  if (relroot)
+    *relroot = NULL;
+
   fp = fopen ("/proc/self/mountinfo", "r");
   if (! fp)
     return NULL; /* fall through to other methods */
 
-  if (relroot)
-    *relroot = NULL;
-
   while (getline (&buf, &len, fp) > 0)
     {
       int mnt_id, parent_mnt_id;