* grub-core/disk/raid.c (insert_array): Ensure uniqueness of p->number

	even if some elements have a name.
	Reported by: Alexander GQ Gerasiov.

diff --git a/ChangeLog b/ChangeLog
index 062f3c5a8a5ca99f47f81aa8ff7feadf4b51cf51..cb499bb01ce6ebc51000ef43c4da8b1263e9c190 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/disk/raid.c (insert_array): Ensure uniqueness of p->number
+       even if some elements have a name.
+       Reported by: Alexander GQ Gerasiov.
+
 2011-01-22  Colin Watson  <cjwatson@ubuntu.com>
 
        * util/grub-mkconfig_lib.in (is_path_readable_by_grub): Consider a

diff --git a/grub-core/disk/raid.c b/grub-core/disk/raid.c
index c789fea50628defef94e2d953b91e2a4f9eaf15b..3972e1632a7f2f48bf123dd63ea922a65cc25554 100644 (file)
--- a/grub-core/disk/raid.c
+++ b/grub-core/disk/raid.c
@@ -570,7 +570,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
        {
          for (p = array_list; p != NULL; p = p->next)
            {
-             if (! p->name && p->number == array->number) 
+             if (p->number == array->number) 
                break;
            }
        }