From af63ada2bd7e624261cbe9b6b9d58134bf51b6e3 Mon Sep 17 00:00:00 2001
From: fzielcke <fzielcke@localhost>
Date: Wed, 8 Apr 2009 15:03:50 +0000
Subject: [PATCH] 2009-04-08  Felix Zielcke  <fzielcke@z-51.de>

        * disk/lvm.c (grub_lvm_scan_device): Add a missing NULL check.
---
 ChangeLog  | 4 ++++
 disk/lvm.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c67998201..c728d7b26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-08  Felix Zielcke  <fzielcke@z-51.de>
+
+	* disk/lvm.c (grub_lvm_scan_device): Add a missing NULL check.
+
 2009-04-07  David S. Miller  <davem@davemloft.net>
 
 	* kern/sparc64/dl.c (grub_arch_dl_relocate_symbols): Add
diff --git a/disk/lvm.c b/disk/lvm.c
index 6ebde636f..d47d4c7b5 100644
--- a/disk/lvm.c
+++ b/disk/lvm.c
@@ -530,7 +530,8 @@ grub_lvm_scan_device (const char *name)
 		  goto fail4;
 		}
 
-	      p = grub_strchr (p, '}');
+	      if (p != NULL)
+		p = grub_strchr (p, '}');
 	      if (p == NULL)
 		goto lvs_fail;
 	      p += 3;