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

* grub-core/fs/iso9660.c (grub_iso9660_susp_iterate): Avoid hang if

Browse source 
entry->len = 0.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-01-03 21:27:00 +01:00
parent 54ce53cadc
commit dadddb7665
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-01-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/iso9660.c (grub_iso9660_susp_iterate): Avoid hang if
entry->len = 0.
2013-01-03 Colin Watson <cjwatson@ubuntu.com> 2013-01-03 Colin Watson <cjwatson@ubuntu.com>
* docs/grub.texi (Invoking grub-mkrelpath): New section. * docs/grub.texi (Invoking grub-mkrelpath): New section.

2
grub-core/fs/iso9660.c
View file

@ -295,7 +295,7 @@ grub_iso9660_susp_iterate (grub_fshelp_node_t node, grub_off_t off,
if (load_sua ()) if (load_sua ())
return grub_errno; return grub_errno;
for (; (char *) entry < (char *) sua + sua_size - 1; for (; (char *) entry < (char *) sua + sua_size - 1 && entry->len > 0;
entry = (struct grub_iso9660_susp_entry *) entry = (struct grub_iso9660_susp_entry *)
((char *) entry + entry->len)) ((char *) entry + entry->len))
{ {