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

even if some elements have a name.
	Reported by: Alexander GQ Gerasiov.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-01-22 13:18:05 +01:00
parent 96e0a6ea97
commit e489601ad0
2 changed files with 7 additions and 1 deletions

View file

@ -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> 2011-01-22 Colin Watson <cjwatson@ubuntu.com>
* util/grub-mkconfig_lib.in (is_path_readable_by_grub): Consider a * util/grub-mkconfig_lib.in (is_path_readable_by_grub): Consider a

View file

@ -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) for (p = array_list; p != NULL; p = p->next)
{ {
if (! p->name && p->number == array->number) if (p->number == array->number)
break; break;
} }
} }