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

2010-01-05 Colin Watson <cjwatson@ubuntu.com>

Browse source 
* util/mkisofs/write.c (padblock_write): Check return value of
	fread.
This commit is contained in:
Colin Watson 2010-01-05 12:40:30 +00:00
parent 7c30297857
commit a136811886
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-01-05 Colin Watson <cjwatson@ubuntu.com>
* util/mkisofs/write.c (padblock_write): Check return value of
fread.
2010-01-05 Robert Millan <rmh.grub@aybabtu.com> 2010-01-05 Robert Millan <rmh.grub@aybabtu.com>
Remove grub-mkfloppy. Images produced by grub-mkrescue are valid Remove grub-mkfloppy. Images produced by grub-mkrescue are valid

4
util/mkisofs/write.c
View file

@ -1437,7 +1437,9 @@ static int FDECL1(padblock_write, FILE *, outfile)
if (! fp) if (! fp)
error (1, errno, _("Unable to open %s"), boot_image_embed); error (1, errno, _("Unable to open %s"), boot_image_embed);
fread (buffer, 2048 * PADBLOCK_SIZE, 1, fp); if (fread (buffer, 2048 * PADBLOCK_SIZE, 1, fp) == 0)
error (1, errno, _("cannot read %llu bytes from %s"),
(size_t) (2048 * PADBLOCK_SIZE), boot_image_embed);
if (fgetc (fp) != EOF) if (fgetc (fp) != EOF)
error (1, 0, _("%s is too big for embed area"), boot_image_embed); error (1, 0, _("%s is too big for embed area"), boot_image_embed);
} }