From 6a23e6b6e1b110304a885db8739927b32fa404d7 Mon Sep 17 00:00:00 2001 From: Felix Zielcke Date: Wed, 8 Apr 2009 15:03:50 +0000 Subject: [PATCH] 2009-04-08 Felix Zielcke * disk/lvm.c (grub_lvm_scan_device): Add a missing NULL check. git-svn-id: svn://svn.savannah.gnu.org/grub/trunk/grub2@2073 d0de0278-0dc1-4c01-8a07-af38b3205e46 --- ChangeLog | 4 ++++ disk/lvm.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c6799820..c728d7b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-04-08 Felix Zielcke + + * disk/lvm.c (grub_lvm_scan_device): Add a missing NULL check. + 2009-04-07 David S. Miller * kern/sparc64/dl.c (grub_arch_dl_relocate_symbols): Add diff --git a/disk/lvm.c b/disk/lvm.c index 6ebde636..d47d4c7b 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; -- 2.11.4.GIT