* grub-core/video/readers/jpeg.c: Avoid division by zero.

diff --git a/ChangeLog b/ChangeLog
index fbdd560cbda2780d54607a73116a3eefcd8802db..7b34ba794352c67f586a212064c1d03db5f68306 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/video/readers/jpeg.c: Avoid sivision by zero.
+
 2015-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/disk/diskfilter.c: Validate volumes to avoid division

diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c
index 2dc2ee10e54f81797aa768e9618f834bfad894c0..38ea2395a214cd9057bb303f91b46fc0facb4cca 100644 (file)
--- a/grub-core/video/readers/jpeg.c
+++ b/grub-core/video/readers/jpeg.c
@@ -317,7 +317,7 @@ grub_jpeg_decode_sof (struct grub_jpeg_data *data)
        {
          data->vs = ss & 0xF;  /* Vertical sampling.  */
          data->hs = ss >> 4;   /* Horizontal sampling.  */
-         if ((data->vs > 2) || (data->hs > 2))
+         if ((data->vs > 2) || (data->hs > 2) || (data->vs == 0) || (data->hs == 0))
            return grub_error (GRUB_ERR_BAD_FILE_TYPE,
                               "jpeg: sampling method not supported");
        }