* grub-core/loader/i386/xnu.c (grub_cpu_xnu_fill_devprop): Don't attempt

to continue if allocation is failed.

	Reported by: David Volgyes <dvolgyes>.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-06-23 20:38:19 +02:00
parent e98c83e910
commit fbc626665f
2 changed files with 12 additions and 5 deletions

View file

@ -1,3 +1,10 @@
2011-06-23 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/xnu.c (grub_cpu_xnu_fill_devprop): Don't attempt
to continue if allocation is failed.
Reported by: David Volgyes <dvolgyes>.
2011-06-23 David Volgyes <dvolgyes> 2011-06-23 David Volgyes <dvolgyes>
* grub-core/bus/usb/ohci.c (grub_ohci_pci_iter): Avoid NULL-pointer * grub-core/bus/usb/ohci.c (grub_ohci_pci_iter): Avoid NULL-pointer

View file

@ -452,11 +452,11 @@ grub_cpu_xnu_fill_devprop (void)
} }
devprop = grub_xnu_create_value (&(efikey->first_child), "device-properties"); devprop = grub_xnu_create_value (&(efikey->first_child), "device-properties");
if (devprop) if (!devprop)
{ return grub_errno;
devprop->data = grub_malloc (total_length);
devprop->datasize = total_length; devprop->data = grub_malloc (total_length);
} devprop->datasize = total_length;
ptr = devprop->data; ptr = devprop->data;
head = ptr; head = ptr;