* grub-core/video/readers/png.c (grub_png_decode_image_header):

	Fix formula for computing total number of bytes.

diff --git a/ChangeLog b/ChangeLog
index e90b9b26e09ab56333c021a59fab1b40a43e5945..15c98121d3af6f73ae6b11d80dda729cb119eb43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/video/readers/png.c (grub_png_decode_image_header):
+       Fix formula for computing total number of bytes.
+
 2013-09-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/video/readers/tga.c: Reorganize to separate RLE and

diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
index 5e09d22fad370c662ce11ed6916a3de605c459e3..edc9eb25686d67139cc76c0cc287409a5c5fe44a 100644 (file)
--- a/grub-core/video/readers/png.c
+++ b/grub-core/video/readers/png.c
@@ -278,7 +278,7 @@ grub_png_decode_image_header (struct grub_png_data *data)
     }
 #endif
 
-  data->raw_bytes = data->image_height * (data->image_width + 1) * data->bpp;
+  data->raw_bytes = data->image_height * (data->image_width * data->bpp + 1)
 
   data->cur_column = 0;
   data->first_line = 1;