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

* grub-core/loader/xnu.c (grub_xnu_writetree_toheap_real): Avoid set

Browse source 
in if.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-12 19:08:55 +01:00
parent db5fc59616
commit 59bfe502c9
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-12 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/xnu.c (grub_xnu_writetree_toheap_real): Avoid set
in if.
2012-02-12 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/efi/appleloader.c (grub_cmd_appleloader): Move

11
grub-core/loader/xnu.c
View file

@ -189,10 +189,13 @@ grub_xnu_writetree_toheap_real (void *curptr,
/* And then the keys. Recursively use this function. */
for (cur = start; cur; cur = cur->next)
if (cur->datasize == -1)
if (!(curptr = grub_xnu_writetree_toheap_real (curptr,
cur->first_child,
cur->name)))
return 0;
{
curptr = grub_xnu_writetree_toheap_real (curptr,
cur->first_child,
cur->name);
if (!curptr)
return 0;
}
return curptr;
}