vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't try to malloc if grub_mm_base is 0

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-08-28 11:32:49 +02:00
parent dc1bff761f
commit 4619710a05
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
grub-core/kern/mm.c
View file

@ -284,6 +284,9 @@ grub_memalign (grub_size_t align, grub_size_t size)
grub_size_t n = ((size + GRUB_MM_ALIGN - 1) >> GRUB_MM_ALIGN_LOG2) + 1; grub_size_t n = ((size + GRUB_MM_ALIGN - 1) >> GRUB_MM_ALIGN_LOG2) + 1;
int count = 0; int count = 0;
if (!grub_mm_base)
goto fail;
align = (align >> GRUB_MM_ALIGN_LOG2); align = (align >> GRUB_MM_ALIGN_LOG2);
if (align == 0) if (align == 0)
align = 1; align = 1;
@ -318,6 +321,7 @@ grub_memalign (grub_size_t align, grub_size_t size)
break; break;
} }
fail:
grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory"); grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
return 0; return 0;
} }