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

	* util/mkisofs/write.c (padblock_write): Switch size and nmemb
	arguments to fread so that we get a return value in bytes, rather
	than something that will normally be rounded down to 0.
	Adjust error handling to avoid producing garbage when size_t is not
	the same size as long long.

diff --git a/ChangeLog b/ChangeLog
index 061fadc180d718bfb7e6de464edb392867e70ee3..bd32107f088464aa029ebd5cb04821fe9abdcbb7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-05  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/mkisofs/write.c (padblock_write): Switch size and nmemb
+       arguments to fread so that we get a return value in bytes, rather
+       than something that will normally be rounded down to 0.
+       Adjust error handling to avoid producing garbage when size_t is not
+       the same size as long long.
+
 2010-01-05  Colin Watson  <cjwatson@ubuntu.com>
 
        * util/mkisofs/write.c (padblock_write): Check return value of

diff --git a/util/mkisofs/write.c b/util/mkisofs/write.c
index d9b1fd05d859546cc78cf978aca7dc3d78001a0a..5447229c83822afb19aff1bfa722c90890cff5f1 100644 (file)
--- a/util/mkisofs/write.c
+++ b/util/mkisofs/write.c
@@ -1437,9 +1437,9 @@ static int FDECL1(padblock_write, FILE *, outfile)
       if (! fp)
        error (1, errno, _("Unable to open %s"), boot_image_embed);
 
-      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 (fread (buffer, 1, 2048 * PADBLOCK_SIZE, fp) == 0)
+       error (1, errno, _("cannot read %d bytes from %s"),
+              2048 * PADBLOCK_SIZE, boot_image_embed);
       if (fgetc (fp) != EOF)
        error (1, 0, _("%s is too big for embed area"), boot_image_embed);
     }