2009-04-08 Felix Zielcke <fzielcke@z-51.de>

        * disk/lvm.c (grub_lvm_scan_device): Add a missing NULL check.

diff --git a/ChangeLog b/ChangeLog
index c679982013508287492e0e9ad7337d723f145899..c728d7b2622a091ecc72a39409233a53b67f430d 100644 (file)
--- 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 6ebde636ff408f9654564e8062410c518035cb5b..d47d4c7b5093f82a763af8cb44887241a7f1e90d 100644 (file)
--- 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;